chore: resolve conflicts

2023-10-04 18:45:02 +05:00
parent 2b6a6f867e 68150b511f
commit 52860c5c9d
41 changed files with 867 additions and 213 deletions
--- a/.github/workflows/docker-compose.yml.mysqldbdump
+++ b/.github/workflows/docker-compose.yml.mysqldbdump
@@ -2,7 +2,7 @@ version: '3'
 services:
  mysql:
    image: mysql:5.7
-    container_name: edx.devstack.mysql57
+    container_name: edx.devstack.mysql80
    ports:
      - '3306:3306'
    environment: