added conversion for spaces

1 files changed, 0 insertions, 4 deletions

diff --git a/main.js b/main.js
index f4141fe..212e76e 100644
--- a/main.js
+++ b/main.js
@@ -96,12 +96,8 @@ N˜
 MÂ
 <¯
 >˘
-<<<<<<< HEAD
-?¿`.split("\n");
-=======
 ?¿
   `.split("\n");
->>>>>>> 83860e4 (made const before the match map)
 
 function convert(input, mode) {
     input = input.split("");