1 files changed, 0 insertions, 12 deletions
diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index ee918ae43..992ca408a 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -44,18 +44,6 @@ class Parser;
  */
 class CVC5_EXPORT ParserBuilder
 {
-<<<<<<< HEAD
-=======
-  enum InputType {
-    FILE_INPUT,
-    STREAM_INPUT,
-    STRING_INPUT
-  };
-
-  /** The input type. */
-  InputType d_inputType;
-
->>>>>>> 81404ddfc (Always parse streams with line buffer)
   /** The input language */
   InputLanguage d_lang;