fixing git diff comments

Nora-Khalil · May 28, 2024 · e85af70 · e85af70
1 parent 3c48810
commit e85af70
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/rmgpy/data/base.py b/rmgpy/data/base.py
@@ -236,14 +236,8 @@ def load(self, path, local_context=None, global_context=None):
             local_context[key] = value
 
         # Process the file
-<<<<<<< Updated upstream
         with open(path, 'r') as f:
             content = f.read()
-=======
-        f = open(path, 'r')
-        if "Intra_R_Add_Endocyclic/rules" in path:
-            print(f.read())
->>>>>>> Stashed changes
         try:
             exec(content, global_context, local_context)
         except Exception as e: