finish merge

enthought · Nov 20, 2020 · 6de956b · 6de956b
1 parent 4c52201
commit 6de956b
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/apptools/naming/object_serializer.py b/apptools/naming/object_serializer.py
@@ -55,13 +55,7 @@ def load(self, path):
         f = open(path, "rb")
         try:
             try:
-<<<<<<< HEAD
                  obj = VersionedUnpickler(f).load()
-=======
-                obj = sweet_pickle.load(f)
-            #                obj = cPickle.load(f)
-            #                obj = pickle.load(f)
->>>>>>> master
             except Exception as ex:
                 print_exc()
                 logger.exception(
@@ -91,13 +85,7 @@ def save(self, path, obj):
         # Pickle the object.
         f = open(actual_path, "wb")
         try:
-<<<<<<< HEAD
             pickle.dump(obj, f, 1)
-=======
-            sweet_pickle.dump(obj, f, 1)
-        #            cPickle.dump(obj, f, 1)
-        #            pickle.dump(obj, f, 1)
->>>>>>> master
         except Exception as ex:
             logger.exception(
                 "Failed to pickle into file: %s, %s, object:%s"