fix setup.py

lukaspie · Feb 6, 2024 · fc471e5 · fc471e5
1 parent e2db733
commit fc471e5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -8,11 +8,7 @@
 fully automating hyperparameter tuning and model evaluation.
 Talos supports Tensorflow and Pytorch.
 
-<<<<<<< HEAD
 Talos exposes backend functionality entirely and there is
-=======
-Talos exposes backend functionality entirely and there is
->>>>>>> master
 no new syntax or templates to learn.
 """