Skip to content
Snippets Groups Projects
Commit ad86b945 authored by anonymous's avatar anonymous
Browse files

merge

parent 37394c51
Branches
Tags
No related merge requests found
...@@ -290,11 +290,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -290,11 +290,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
'odsh_tracking_url': odsh_helpers.odsh_tracking_url, 'odsh_tracking_url': odsh_helpers.odsh_tracking_url,
'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets, 'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets,
'odsh_public_url': odsh_helpers.odsh_public_url, '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 'odsh_public_resource_url': odsh_helpers.odsh_public_resource_url
>>>>>>> sprint11
} }
def after_map(self, map): def after_map(self, map):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment