README.md back to normal

antecedent · Feb 22, 2016 · f691893 · f691893
1 parent 83d5423
commit f691893
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Patchwork 1.4 ([.phar](https://github.com/antecedent/patchwork/releases/download/1.4.2/patchwork.phar))
-=======
-# Patchwork 1.4 ([.phar](https://github.com/antecedent/patchwork/releases/download/1.4.1/patchwork.phar))
->>>>>>> origin/master
 
 Patchwork implements the redefinition ([monkey-patching](https://en.wikipedia.org/wiki/Monkey_patch)) of **user-defined** methods in PHP.