Update requirements.txt

Removed merge text.
kevinksyTRD · Aug 19, 2020 · 4323b5f · 4323b5f
1 parent db003c5
commit 4323b5f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,4 @@ pytest
 pandas
 numpy
 xmlschema
-<<<<<<< HEAD
-=======
 pyOSPParser
->>>>>>> master