Permalink
Browse files

Remove merge conflict remnant from readme

  • Loading branch information...
1 parent fe4dd91 commit 3608e813e38273dc0652147a3b339fbc057f14eb @terite terite committed Dec 10, 2013
Showing with 0 additions and 1 deletion.
  1. +0 −1 README.markdown
View
@@ -251,4 +251,3 @@ $versionManager = new VersionManager($em);
$versionManager->revert($blogPost, 100);
$em->flush();
```
->>>>>>> marijn/patch-1

0 comments on commit 3608e81

Please sign in to comment.