Fixed merge conflict

nsacyber · Nov 14, 2018 · e542c1c · e542c1c
1 parent a56c1d6
commit e542c1c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,6 @@ pynacl
 alembic
 healthcheck
 psycopg2-binary
-<<<<<<< HEAD
 click
 kubernetes
 pyopenssl
@@ -37,6 +36,3 @@ werkzeug
 prometheus_flask_exporter
 requests
 swagger_spec_validator
-=======
-swagger-spec-validator
->>>>>>> master