From e0df78a6409fb65f9873de4e582451949bbcb945 Mon Sep 17 00:00:00 2001
From: Micah Gale <mg@gale.engineer>
Date: Wed, 10 Jan 2024 15:03:48 -0600
Subject: [PATCH] Removed merge artifact.

---
 montepy/errors.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/montepy/errors.py b/montepy/errors.py
index a61b73b3..f0c2464d 100644
--- a/montepy/errors.py
+++ b/montepy/errors.py
@@ -10,8 +10,7 @@ def __init__(self, message):
 
 class MalformedInputError(ValueError):
     """
-    <<<<<<< HEAD
-        Raised when there is an error with the MCNP input not related to the parser.
+    Raised when there is an error with the MCNP input not related to the parser.
     """
 
     def __init__(self, input, message):