mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 10:26:28 +01:00
CI/CircleCI: Fix invalid merge conflict resolution
This commit is contained in:
@@ -36,6 +36,10 @@ jobs:
|
||||
cat sql/updates/world/master/*.sql | mysql -h 127.0.0.1 -uroot world
|
||||
echo "Importing hotfixes database updates"
|
||||
cat sql/updates/hotfixes/master/*.sql | mysql -h 127.0.0.1 -uroot hotfixes
|
||||
pch:
|
||||
docker:
|
||||
- image: trinitycore/circle-ci:master-buildpacks-focal
|
||||
steps:
|
||||
- run:
|
||||
name: Checkout
|
||||
command: |
|
||||
|
||||
Reference in New Issue
Block a user