Restore Wraith package description post-Ghost 0.4 merge.

hawkrives · Feb 1, 2014 · 8ffffbe · 8ffffbe
1 parent 329f476
commit 8ffffbe
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,17 +1,9 @@
 {
-<<<<<<< HEAD
     "name"        : "Wraith",
     "version"     : "0.0.1",
     "description" : "Revenge of the Databases",
     "author"      : "Oluseyi Sonaiya",
     "homepage"    : "http://github.com/oluseyi/Wraith",
-=======
-    "name"        : "ghost",
-    "version"     : "0.4.1",
-    "description" : "Just a blogging platform.",
-    "author"      : "Ghost Foundation",
-    "homepage"    : "http://ghost.org",
->>>>>>> Version bump for 0.4 release
     "keywords"    : [
         "wraith",
         "ghost",