backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

fix merge conflict

Browse Source
This commit is contained in:
Barbara Miller 2018-02-28 15:06:21 -08:00
parent e4c86773c8
commit 3f10aafdc4
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_warcprox.py
View File

@ -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