fix bad merge - issue ContainX#38

gondor · May 18, 2016 · efa25a3 · efa25a3
1 parent 4b8f2cc
commit efa25a3
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/support/systemd/lib/systemd/system/docker-volume-netshare.service b/support/systemd/lib/systemd/system/docker-volume-netshare.service
@@ -1,15 +1,9 @@
 [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]
@@ -19,4 +13,3 @@ StandardOutput=syslog
 
 [Install]
 WantedBy=multi-user.target
-