correcting incomplete git merge of eg_fstab_head

diff --git a/templates/eg_fstab_head b/templates/eg_fstab_head
index 2a25f3d..5ccd800 100755 (executable)
--- a/templates/eg_fstab_head
+++ b/templates/eg_fstab_head
@@ -1,9 +1,4 @@
 ## NFS Mounts for Evergreen.
 UTILITY01_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
 UTILITY01_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
-<<<<<<< HEAD
-#UTILITY02_IP:/openils/var/data/offline /openils/var/data/offline/ nfs rw 0 0
-#UTILITY02_IP:/openils/var/data/vandelay /openils/var/data/vandelay/ nfs rw 0 0
-=======
->>>>>>> 96b0548a13f5d6aa30dadcbdd9d08dfaa069bffa
 REPORTER_OUTPUT_NFS_HOST_IP:/storage/reports-output /openils/var/web/reporter/ nfs rw 0 0