resolve conflict

ddo · Mar 5, 2014 · 4de9006 · 4de9006
1 parent a29b956
commit 4de9006
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -264,11 +264,7 @@ require(express-orm-mvc)({
 
 ##Todo
 
-<<<<<<< HEAD
 * Express 4 testing
-=======
-* Caller dirname
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ddo/express-orm-mvc/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
->>>>>>> aaaae50d706b810f84b453cd2395f5abe8101027
+===
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ddo/express-orm-mvc/trend.png)](https://bitdeli.com/free "Bitdeli Badge")