From 948accfa04d83ff39bc3b3c10fd2d44dc855c37e Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@baculasystems.com>
Date: Thu, 3 Dec 2020 18:34:47 +0100
Subject: [PATCH] Fix .gitignore

---
 regress/.gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/regress/.gitignore b/regress/.gitignore
index 6ee40cacc..8b2a1efe7 100644
--- 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/
-- 
2.47.3