Permalink
Browse files

cleaning

  • Loading branch information...
1 parent c9112cb commit fd4e09c652f941f95d7cc5886113ac15559d1841 nex committed Dec 11, 2012
Showing with 1 addition and 8 deletions.
  1. +1 −8 README.md
View
9 README.md
@@ -1,7 +1,6 @@
-<<<<<<< HEAD
# playr
-A Clojure library designed to ... well, that part is up to you.
+Facilita la creación de playbooks de ansible
## Usage
@@ -12,9 +11,3 @@ FIXME
Copyright © 2012 FIXME
Distributed under the Eclipse Public License, the same as Clojure.
-=======
-playr
-=====
-
-Facilita la creación de playbooks de ansible
->>>>>>> 5d48b900eb1054144fc39c6b9181ae5f81c89d42

0 comments on commit fd4e09c

Please sign in to comment.