Fix .gitignore

diff --git a/regress/.gitignore b/regress/.gitignore
index 6ee40cacc7ae023fd2e0a9eef3604ebedc223b63..8b2a1efe705a59db9cf5a97daf3f50e163de87eb 100644 (file)
--- a/regress/.gitignore
+++ b/regress/.gitignore
@@ -43,9 +43,6 @@ scripts/prepare-two-tapes
 scripts/regress-config
 scripts/update-ctest
 scripts/mtx-changer
-<<<<<<< HEAD
-=======
 scripts/k8s_backend
 scripts/bacula-dir.conf.gpfs
->>>>>>> e694fcf7a1... regress: Add regress script for GPFS code
 /tmp2/