fixing merging issues

README.md

@@ -188,7 +188,7 @@ Change the name and then:
 sudo /etc/init.d/hostname.sh start
 ```
 
-<<<<<<< HEAD
+
 #To mount datastore :
 nfs-kernel on main server (woody)
 on node : vim /etc/fstab
@@ -198,7 +198,7 @@ sudo vim /etc/exports
 /mnt/datastore/ worker0.irisa.fr(rw,all_squash,anonuid=1000,anongid=1000,sync)
 /mnt/datastore/ worker1.irisa.fr(rw,all_squash,anonuid=1000,anongid=1000,sync)
 /mnt/datastore/ sid.irisa.fr(rw,all_squash,anonuid=1000,anongid=1000,sync)
-=======
+
 ##Cargo
 You need to install docker-registry on it:
 ```zsh

deploy/provisioning/webapp-launch.sh

@@ -17,13 +17,8 @@ cat ~/.ssh/id_rsa.pub | ssh 192.168.50.03 "cat - >> ~/.ssh/authorized_keys"
 #swarm manage 192.168.50.10:2375,192.168.50.11:2375 2>>/home/vagrant/allgo/log/swarm.log &
 #end
 docker run swarm create > /mnt/datastore/token_id
-<<<<<<< HEAD
 toto=$(cat /mnt/datastore/token_id)
 docker run -d -p 2375:2375 --name swarm_manager swarm manage token://$toto
-=======
-token=$(cat /mnt/datastore/token_id)
-docker run -d -p 2375:2375 swarm manage token://$token
->>>>>>> 77e928b784484e397f8595b907233d091595ea37
 mkdir /home/vagrant/allgo/
 cd /home/vagrant/allgo/
 mysql -u root allgo_dev < db/backup/backup_mysql_2015-04-30.sql