merge conflcit

11 years ago · 3011491863
parent b2f8a65bc8 a9ca035e1e
commit 3011491863
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -58,7 +58,7 @@
    "validator": "~3.16.1",
    "winston": "~0.7.2",
    "xregexp": "~2.0.0",
-    "templates.js": "0.0.10"
+    "templates.js": "0.0.12"
  },
  "devDependencies": {
    "mocha": "~1.13.0"