From: Peter van Dijk Date: Wed, 6 Oct 2021 08:19:20 +0000 (+0200) Subject: remove empty files from merge resolving X-Git-Tag: rec-4.4.6^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34bc635a79b69375595eaf3b6d66f1e5b69542f1;p=thirdparty%2Fpdns.git remove empty files from merge resolving --- diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Dockerfile-auth b/Dockerfile-auth deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh deleted file mode 100755 index e69de29bb2..0000000000 diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-6 b/builder-support/dockerfiles/Dockerfile.target.centos-6 deleted file mode 100644 index e69de29bb2..0000000000