remove git conflict line breaks

oceanzou123 · Nov 19, 2015 · c98bc05 · c98bc05
1 parent 8daf650
commit c98bc05
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/mojs.coffee b/js/mojs.coffee
@@ -33,7 +33,3 @@ if (typeof module is "object") and (typeof module.exports is "object")
   module.exports = mojs
 # ### istanbul ignore next ###
 # return window?.mojs = mojs
-<<<<<<< HEAD
-
-=======
->>>>>>> dev