2019-07-02 AC: solve conflict

lib/charm/openstack/gnocchi.py

@@ -87,7 +87,6 @@ def ceph_config(config):
         return CEPH_CONF
 
 
-<<<<<<< HEAD:lib/charm/openstack/gnocchi.py
 @charms_openstack.adapters.config_property
 def file_pathbase(config):
     file_pathbasedir = '/var/lib/gnocchi/measures'
@@ -141,8 +140,6 @@ class StorageCephRelationAdapter(adapters.OpenStackRelationAdapter):
             return None
 
 
-=======
->>>>>>> github/master:src/lib/charm/openstack/gnocchi.py
 class GnocchiCharmRelationAdapaters(adapters.OpenStackAPIRelationAdapters):
 
     """