From 8723fc4def429a300f204a9f121ee539f8d0b110 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake.moshenko@coreos.com>
Date: Tue, 3 Nov 2015 11:18:57 -0500
Subject: [PATCH] Remove edit marks in requirements-nover

---
 requirements-nover.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/requirements-nover.txt b/requirements-nover.txt
index fe4336bd8..9b0427489 100644
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@@ -54,9 +54,5 @@ Flask-Testing
 pyjwt
 toposort
 pyjwkest
-<<<<<<< HEAD
 rfc3987
 jsonpath-rw
-=======
-jsonpath-rw
->>>>>>> upstream/master