Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 11, 2012
nex cleanin c9112cb
nex cleaning fd4e09c
Showing with 1 addition and 8 deletions.
  1. +1 −8 README.md
  2. BIN src/playr/.modules.clj.swp
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
View
BIN src/playr/.modules.clj.swp
Binary file not shown.

No commit comments for this range

Something went wrong with that request. Please try again.