From fc471e54cbee1b35e2d4354bc198ab000b9865d6 Mon Sep 17 00:00:00 2001
From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com>
Date: Tue, 6 Feb 2024 11:25:28 +0100
Subject: [PATCH] fix setup.py

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index d318782..06178a3 100644
--- 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.
 """