Removed merge artifact.

idaholab · Jan 10, 2024 · e0df78a · e0df78a
1 parent eea63ef
commit e0df78a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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):