From ad86b945df3e0279e335574efe766e9c89989af1 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Tue, 4 Jun 2019 10:09:20 +0200
Subject: [PATCH] merge
---
ckanext/odsh/plugin.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py
index 29795868..e188eb6f 100644
--- a/ckanext/odsh/plugin.py
+++ b/ckanext/odsh/plugin.py
@@ -290,11 +290,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
'odsh_tracking_url': odsh_helpers.odsh_tracking_url,
'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets,
'odsh_public_url': odsh_helpers.odsh_public_url,
-<<<<<<< HEAD
- 'odsh_spatial_extends_available': odsh_helpers.spatial_extends_available
-=======
+ 'odsh_spatial_extends_available': odsh_helpers.spatial_extends_available,
'odsh_public_resource_url': odsh_helpers.odsh_public_resource_url
->>>>>>> sprint11
}
def after_map(self, map):
--
GitLab