diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-01-24 16:47:44 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-24 16:47:44 +0100 |
| commit | f39e61078f51855a76ab658813fbf4e8d28edccd (patch) | |
| tree | c6ac1cc40fbe0cc537b20f5813bb971f0fe95bf2 | |
| parent | 23ad14526cfbb61aa686f3d7966e74c6dfc0cf95 (diff) | |
CI/CircleCI: Fix invalid merge conflict resolution
| -rw-r--r-- | .circleci/config.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d39d6c427ff..94eb5c5384c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: | |