fixed one of the tests

dan3944 · Mar 26, 2017 · 6e91b59 · 6e91b59
1 parent 8433e40
commit 6e91b59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test/string.emoji b/test/string.emoji
@@ -1,6 +1,6 @@
 console🍍log🌜"You can output reserved emojis as strings, and emojiscript won't replace them: "🌛
-<<<<<<< HEAD
 console🍍log🌜"🔨🏨👶\n"🌛
 
 console🍍log🌜"You can even use Javascript's reserved words as variable names: "🌛
-🍰 if ⚖ "if"
+🍰 if ⚖ "if"
+console🍍log🌜if🌛