update go dirs

ContainX · May 14, 2016 · 4b8f2cc · 4b8f2cc
2 parents 844c56e + b23fe65
commit 4b8f2cc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/support/systemd/lib/systemd/system/docker-volume-netshare.service b/support/systemd/lib/systemd/system/docker-volume-netshare.service
@@ -1,8 +1,15 @@
 [Unit]
 Description=Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
+<<<<<<< HEAD
 Documentation=https://github.com/ContainX/docker-volume-netshare
 After=nfs-utils.service	docker.service
 Requires=docker.service
+=======
+Documentation=https://github.com/gondor/docker-volume-netshare
+After=nfs-utils.service
+Before=docker.service
+Requires=nfs-utils.service
+>>>>>>> b23fe656606d7043631ecf7c5e8f60cbd3185972
 
 
 [Service]