From f39e61078f51855a76ab658813fbf4e8d28edccd Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 24 Jan 2022 16:47:44 +0100 Subject: CI/CircleCI: Fix invalid merge conflict resolution --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.circleci') 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: | -- cgit v1.2.3