Commit 7854611e authored by Lars Becker's avatar Lars Becker Committed by Curtis Adam

fix merge conflict .jshintrc

parent e4cb8e1e
......@@ -54,6 +54,10 @@
"browser": true,
"client": true,
"module": true,
"expect": true
"expect": true,
"Ground": false,
"SSR": true,
"process": true,
"Assets": true
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment