From f8230f812191e9e26b5bbff1d06f2d866b442c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2EFernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Sun, 11 Mar 2012 16:05:01 +0100
Subject: [PATCH] Added mailer(*) as a dependency

---
 package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package.json b/package.json
index 0caaffd..e5d42b7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,12 @@
     "node": ">= v0.4.7"
   },
   "dependencies": {
+<<<<<<< HEAD
     "hook.io" : "0.8.x"
+=======
+    "hook.io" : "0.8.x",
+    "mailer" : "*"
+>>>>>>> 0e1e4a8... Added mailer(*) as a dependency
   },
   "devDependencies": {}
 }