remove conflict

bagustris · Jun 22, 2024 · 544f9dc · 544f9dc
1 parent a882073
commit 544f9dc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/nkululeko/utils/util.py b/nkululeko/utils/util.py
@@ -301,11 +301,7 @@ def config_val_list(self, section, key, default):
 
     def get_labels(self):
         return ast.literal_eval(self.config["DATA"]["labels"])
-<<<<<<< HEAD
 
-=======
-
->>>>>>> ensemble
     def continuous_to_categorical(self, series):
         """
         discretize a categorical variable.