CI/CircleCI: Fix invalid merge conflict resolution

2022-01-24 16:47:44 +01:00
parent 23ad14526c
commit f39e61078f
1 changed files with 4 additions and 0 deletions
@@ -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: |