+-

catalyst-team · Nov 24, 2020 · 41f4d0e · 41f4d0e
1 parent d38af3b
commit 41f4d0e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -2,8 +2,5 @@ numpy>=1.16.4
 torch>=1.2.0
 PyYAML
 tqdm>=4.33.0
-<<<<<<< HEAD
 tensorboardX>=2.1.0
-=======
 packaging
->>>>>>> cad4c15f907844aa2aaafd02377cbe9b03512989