Remove >>>> extra due to merge conflict in tools

bobleesj · web-flow · commit 32c00188343d · 2024-12-25T17:19:37.000-05:00
diff --git a/src/diffpy/utils/tools.py b/src/diffpy/utils/tools.py
@@ -41,8 +41,7 @@ def _stringify(obj):
 
 
 def _load_config(file_path):
-    """Load configuration from a .json file. >>>>>>>
-    de55560eb525ef412c38bb31d21d43d9b170d3f6.
+    """Load configuration from a .json file.
 
     Parameters
     ----------
