From 9d99c8e3b100e2756597049a28aa1e6783f74661 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Fri, 10 Jul 2020 13:43:32 +0200
Subject: [PATCH] Fixed silly merge error

---
 App/tools/driver.makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index c4993899..007e1c92 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -1121,9 +1121,7 @@ endif # EPICSVERSION defined
 ## Thursday, March  7 00:11:50 CET 2019     : Add E3_SITEMODS_PATH, E3_SITEAPPS_PATH in the dep file generation.
 ##
 ## Monday, September  9 15:25:53 CEST 2019  : Revert E3_SITEMODS_PATH from E3_SITELIBS_PATH in the snc path
-<<<<<<< HEAD
-=======
 ##
 ## Tuesday, June 30 2020                    : Combine NFS E3 driver.makefile with conda version
 ##
-## Friday, July 3 2020                      : Force all module names to be lowercase, to allow consistency between conda/
\ No newline at end of file
+## Friday, July 3 2020                      : Force all module names to be lowercase, to allow consistency between conda/nfs startup scripts.
-- 
GitLab