I forgot a header apparently. lol

interpreter/code_interpreters/languages/applescript.py

@@ -2,21 +2,13 @@
 from ..subprocess_code_interpreter import SubprocessCodeInterpreter
 
 class AppleScript(SubprocessCodeInterpreter):
-<<<<<<< HEAD
 
     file_extension = "applescript"
     proper_name = "AppleScript"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-=======
-    file_extension = "applescript"
-    proper_name = "AppleScript"
-
-    def __init__(self):
-        super().__init__()
->>>>>>> upstream/main
         self.start_cmd = os.environ.get('SHELL', '/bin/zsh')
 
     def preprocess_code(self, code):

interpreter/code_interpreters/languages/html.py

@@ -7,14 +7,9 @@ class HTML(BaseCodeInterpreter):
     file_extension = "html"
     proper_name = "HTML"
 
-<<<<<<< HEAD
     def __init__(self, **kwargs):
         super().__init__(**kwargs) # include kwargs though they dont do anything in this case.
                                    # This is just so we dont need more logic in the create interpreter function
-=======
-    def __init__(self):
-        super().__init__()
->>>>>>> upstream/main
 
     def run(self, code):
         # Create a temporary HTML file with the content

interpreter/code_interpreters/languages/javascript.py

@@ -2,21 +2,13 @@
 import re
 
 class JavaScript(SubprocessCodeInterpreter):
-<<<<<<< HEAD
 
     file_extension = "js"
     proper_name = "JavaScript"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-=======
-    file_extension = "js"
-    proper_name = "JavaScript"
-
-    def __init__(self):
-        super().__init__()
->>>>>>> upstream/main
         self.start_cmd = "node -i"
 
     def preprocess_code(self, code):

interpreter/code_interpreters/languages/python.py

@@ -4,7 +4,6 @@
 import re
 
 class Python(SubprocessCodeInterpreter):
-<<<<<<< HEAD
 
     file_extension = "py"
     proper_name = "Python"
@@ -15,14 +14,6 @@ def __init__(self, **kwargs):
             self.start_cmd = "python3 -i -q -u"
         else:
             self.start_cmd = sys.executable + " -i -q -u"
-=======
-    file_extension = "py"
-    proper_name = "Python"
-
-    def __init__(self):
-        super().__init__()
-        self.start_cmd = sys.executable + " -i -q -u"
->>>>>>> upstream/main
 
     def preprocess_code(self, code):
         return preprocess_python(code)

interpreter/code_interpreters/languages/r.py

@@ -2,21 +2,13 @@
 import re
 
 class R(SubprocessCodeInterpreter):
-<<<<<<< HEAD
 
 
     file_extension = "r"
     proper_name = "R"
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-=======
-    file_extension = "r"
-    proper_name = "R"
-
-    def __init__(self):
-        super().__init__()
->>>>>>> upstream/main
         self.start_cmd = "R -q --vanilla"  # Start R in quiet and vanilla mode
 
     def preprocess_code(self, code):

interpreter/code_interpreters/languages/shell.py

@@ -4,17 +4,9 @@
 import os
 
 class Shell(SubprocessCodeInterpreter):
-<<<<<<< HEAD
 
     file_extension = "sh"
     proper_name = "Shell"
-=======
-    file_extension = "sh"
-    proper_name = "Shell"
-
-    def __init__(self):
-        super().__init__()
->>>>>>> upstream/main
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)