Skip to content

Commit efa25a3

Browse files
committed
fix bad merge - issue #38
1 parent 4b8f2cc commit efa25a3

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
[Unit]
22
Description=Docker NFS, AWS EFS & Samba/CIFS Volume Plugin
3-
<<<<<<< HEAD
4-
Documentation=https://github.com/ContainX/docker-volume-netshare
5-
After=nfs-utils.service docker.service
6-
Requires=docker.service
7-
=======
83
Documentation=https://github.com/gondor/docker-volume-netshare
94
After=nfs-utils.service
105
Before=docker.service
116
Requires=nfs-utils.service
12-
>>>>>>> b23fe656606d7043631ecf7c5e8f60cbd3185972
137

148

159
[Service]
@@ -19,4 +13,3 @@ StandardOutput=syslog
1913

2014
[Install]
2115
WantedBy=multi-user.target
22-

0 commit comments

Comments
 (0)