Update core.py -- fixing bad merge

econ-ark · Nov 13, 2023 · c4feeb3 · c4feeb3
1 parent 1bd53cf
commit c4feeb3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/HARK/core.py b/HARK/core.py
@@ -29,12 +29,8 @@
 from HARK.parallel import multi_thread_commands, multi_thread_commands_fake
 from HARK.utilities import NullFunc, get_arg_names
 
-<<<<<<< HEAD
-=======
 # Set logging and define basic functions
 import logging
-
->>>>>>> 7c443df5 (black)
 logging.basicConfig(format="%(message)s")
 _log = logging.getLogger("HARK")
 _log.setLevel(logging.ERROR)