From 4c1f27161e0404497aa371b9bc010a5cd78df2cc Mon Sep 17 00:00:00 2001 From: David Read Date: Fri, 12 Feb 2016 18:22:36 +0000 Subject: [PATCH] Fix merge --- README.rst | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.rst b/README.rst index e5c1f2f..c033855 100644 --- a/README.rst +++ b/README.rst @@ -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 ============