summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-10-16 17:52:29 +0200
committerJose <jose@zeroc.com>2014-10-16 17:52:29 +0200
commit3270461a48ca892cb3ea9568643ea5e152093de1 (patch)
tree56bc118a66ff30832d6844f69512e01696b8c9b1
parentFix msi signature product names (diff)
downloadice-3270461a48ca892cb3ea9568643ea5e152093de1.tar.bz2
ice-3270461a48ca892cb3ea9568643ea5e152093de1.tar.xz
ice-3270461a48ca892cb3ea9568643ea5e152093de1.zip
Partial Fix (ICE-5749) - IceJS possible Promise conflict.
-rw-r--r--js/.jshintrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/.jshintrc b/js/.jshintrc
index f928b5f54ba..d356ee0b89c 100644
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -9,5 +9,6 @@
"navigator": false,
"escape" : false,
"unescape": false
- }
+ },
+ "predef": ["-Promise"]
}