Fixed package.json

12 years ago · 0184030b2c
parent f8230f8121
commit 0184030b2c
1 changed files with 0 additions and 4 deletions
--- a/package.json
+++ b/package.json
@ -17,12 +17,8 @@
    "node": ">= v0.4.7"
  },
  "dependencies": {
-<<<<<<< HEAD
-    "hook.io" : "0.8.x"
-=======
    "hook.io" : "0.8.x",
    "mailer" : "*"
->>>>>>> 0e1e4a8... Added mailer(*) as a dependency
  },
  "devDependencies": {}
 }