Commit 8be558e

bryfry <bryon.fryer@gmail.com>
2013-06-09 18:45:29
merge readme
master
1 parent 5ce7e4d
Changed files (1)
README.md
README.md
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
 ansible-docker
 ==============
 
 ansible playbook for provisioning docker lxc containers (hosts and containers)
-=======
-ansible-playbooks
-=================
-
-Ansible playbooks for fun and profit
->>>>>>> 63a585e7b72e8ebbb36b254a343e90b64eebf3ea