chore: resolved conflicts

This commit is contained in:
Jannat Patel
2024-12-16 18:13:49 +05:30
2 changed files with 2 additions and 2 deletions

View File

@@ -24,7 +24,7 @@ jobs:
services: services:
mariadb: mariadb:
image: mariadb:10.6 image: mariadb:10.8
env: env:
MARIADB_ROOT_PASSWORD: 123 MARIADB_ROOT_PASSWORD: 123
ports: ports:

View File

@@ -2,7 +2,7 @@ version: "3.7"
name: lms name: lms
services: services:
mariadb: mariadb:
image: mariadb:10.6 image: mariadb:10.8
command: command:
- --character-set-server=utf8mb4 - --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci - --collation-server=utf8mb4_unicode_ci