From: Andy Witter <awitter@georgialibraries.org>
Date: Tue, 12 Dec 2017 19:00:26 +0000 (-0500)
Subject: add remote files, merge, and comment out moutning utility02 on the heads
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=53e44986fa8b22f033fd395774d637e5a8e32fc2;p=contrib%2Fpines%2Fgenasys.git

add remote files, merge, and comment out moutning utility02 on the heads
---

53e44986fa8b22f033fd395774d637e5a8e32fc2
diff --cc templates/eg_fstab_head
index abc6f9e,5ccd800..2a25f3d
--- a/templates/eg_fstab_head
+++ b/templates/eg_fstab_head
@@@ -1,6 -1,4 +1,9 @@@
  ## 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