fixed merge conflict

Former-commit-id: 868354b
kennsippell · Jan 9, 2015 · b5f6935 · b5f6935
2 parents 2c54bbd + ca5025f
commit b5f6935
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -424,4 +424,4 @@ app.use(function(req, res) {
     if (process.env.NODE_ENV == "production") {
         res.status(404).render('404.jade');
     }
-});
+});
diff --git a/backend.js b/backend.js
@@ -288,6 +288,7 @@ function apiRequest(job, cb) {
     var payload = job.data.payload;
     if (!job.data.url) {
         logger.info(job);
+        cb("no url")
     }
     getData(job.data.url, function(err, data) {
         if (data.response) {
@@ -374,4 +375,4 @@ function getData(url, cb) {
             cb(null, JSON.parse(body))
         }
     })
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -424,4 +424,4 @@ app.use(function(req, res) { @@
         if (process.env.NODE_ENV == "production") {
             res.status(404).render('404.jade');
         }
-    });
+    });