From 3f10aafdc4c7d737c6391cbbac60f07e98c57daa Mon Sep 17 00:00:00 2001
From: Barbara Miller <galgeek@me.com>
Date: Wed, 28 Feb 2018 15:06:21 -0800
Subject: [PATCH] fix merge conflict

---
 tests/test_warcprox.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/test_warcprox.py b/tests/test_warcprox.py
index 3df6be2..ac0b986 100755
--- a/tests/test_warcprox.py
+++ b/tests/test_warcprox.py
@@ -1427,15 +1427,9 @@ def test_controller_with_defaults():
     assert wwp.writer_pool.default_warc_writer.record_builder.digest_algorithm == 'sha1'
 
 
-<<<<<<< HEAD
-class MyEarlyPlugin(warcprox.BaseStandardPostfetchProcessor):
-    CHAIN_POSITION = 'early'
-    def _process_put(self):
-=======
 class EarlyPlugin(warcprox.BaseStandardPostfetchProcessor):
     CHAIN_POSITION = 'early'
     def _process_url(self):
->>>>>>> do_not_archive
         pass