Fix merge

This commit is contained in:
David Read 2016-02-12 18:22:36 +00:00
parent 331ad84272
commit 4c1f27161e
1 changed files with 0 additions and 5 deletions

View File

@ -8,11 +8,6 @@ ckanext-harvest - Remote harvesting extension
This extension provides a common harvesting framework for ckan extensions
and adds a CLI and a WUI to CKAN to manage harvesting sources and jobs.
<<<<<<< HEAD
=======
Requires CKAN 2.0 or later.
>>>>>>> 6354ad5656bd8f5d3ff9f75389f17622a6b32044
Installation
============