fixing merge conflicts

from master
2026-05-20 07:17:40 -02:30 · 2015-05-15 17:18:14 -04:00
parent 89a4e43cd0
commit 2b7a2a1a3b
22 changed files with 38 additions and 28 deletions
--- a/.jshintrc
+++ b/.jshintrc
@@ -23,7 +23,8 @@
      "it": false,
      "expect": false,
      "context": false,
-      "describe": false
+      "describe": false,
+      "moment": false
    },
    "strict": false,
    "quotmark": false,