summaryrefslogtreecommitdiffstats
path: root/web/react/.eslintrc
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-27 11:52:13 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-27 11:52:13 -0700
commita133f82421d2c67ef32b0aae69a6646a14f97dfc (patch)
tree35fe7dcf6b208437111c5d3a843eabf2f4703101 /web/react/.eslintrc
parente22b9f53034280cd3b730c03520469dca4046484 (diff)
parente0f69060fa462390779dd7b4cf6b67a12c3974ba (diff)
downloadchat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.gz
chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.tar.bz2
chat-a133f82421d2c67ef32b0aae69a6646a14f97dfc.zip
Merge branch 'master' into PLT-340
Diffstat (limited to 'web/react/.eslintrc')
-rw-r--r--web/react/.eslintrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/.eslintrc b/web/react/.eslintrc
index 6a35d3123..d78068882 100644
--- a/web/react/.eslintrc
+++ b/web/react/.eslintrc
@@ -20,7 +20,8 @@
"globals": {
"React": false,
"ReactDOM": false,
- "ReactBootstrap": false
+ "ReactBootstrap": false,
+ "Chart": false
},
"rules": {
"comma-dangle": [2, "never"],