Merge branch 'master' of https://github.com/mrcrgl/node-querybuilder

Conflicts: index.js package.json
mrcrgl · May 29, 2013 · ce4d0ad · ce4d0ad
1 parent 2eb0530
commit ce4d0ad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -150,7 +150,7 @@ QueryBuilder.prototype._loadMethod = function(methodName) {
     try {
         this.processor = require(__dirname + '/methods/' + methodName.toLowerCase());
     } catch(e) {
-        throw "Method " + methodName + " not found.";
+        throw "Method " + methodName + " corrupt: " + e;
     }
 };
 

diff --git a/package.json b/package.json
@@ -1,11 +1,7 @@
 {
     "name": "querybuilder",
     "description": "Module to create SQL and NoSQL queries.",
-<<<<<<< HEAD
     "version": "1.1.0",
-=======
-    "version": "1.0.4",
->>>>>>> c6e4b7320c042d7679adc4ee99ff049d4d75c3fb
     "author": "Marc Riegel <mail@marclab.de>",
     "homepage": "https://github.com/mrcrgl/node-querybuilder",
     "repository": {
@@ -30,4 +26,4 @@
         "chaining"
     ],
     "license": "MIT"
-}
+}