remove empty files from merge resolving

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/Dockerfile-auth b/Dockerfile-auth
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
deleted file mode 100755 (executable)
index e69de29..0000000

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-6 b/builder-support/dockerfiles/Dockerfile.target.centos-6
deleted file mode 100644 (file)
index e69de29..0000000