missed part of last commit conflict

christkv · Aug 20, 2012 · c633509 · c633509
1 parent 5c91499
commit c633509
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 { "name" :            "trentm-git"
 , "description" :     "A node.js library for git (a fork to publish some fixes to npm)"
 , "version" :         "0.1.3-1"