Fix merge conflict

nyambati · Apr 12, 2016 · ccfe119 · ccfe119
1 parent 51ffe61
commit ccfe119
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -34,10 +34,7 @@
     "sinon",
     "spyOn"
   ],
-<<<<<<< HEAD
   "strict": "false",
-=======
->>>>>>> master
   "quotmark": true,
   "trailing": true,
   "undef": true,