fixing changes

src/unitgrade_devel.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: unitgrade-devel
-Version: 0.1.60
+Version: 0.1.61
 Summary: A set of tools to develop unitgrade tests and reports and later evaluate them
 Home-page: https://lab.compute.dtu.dk/tuhe/unitgrade_private
 Author: Tue Herlau

src/unitgrade_private/utils.py

@@ -38,4 +38,3 @@ def exit_after(s):
             return result
         return inner
     return outer
-

src/unitgrade_private/version.py

+<<<<<<< HEAD
 __version__ = "0.1.62"
+=======
+__version__ = "0.1.61"
+>>>>>>> 05f66ebff680f2f18cf59f9adf46bc6c8ecea3c0