From 959aed3f862591305a3a10f11711023710256021 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 20 Feb 2014 15:09:44 -0500 Subject: [PATCH] Remove accidental merge marker Change-Id: If98066c418f64be9f1bdce16558969d800e602c0 --- elements/opensuse/bin/map-services | 1 - 1 file changed, 1 deletion(-) diff --git a/elements/opensuse/bin/map-services b/elements/opensuse/bin/map-services index ee1cd96c6..4a2e908ae 100755 --- a/elements/opensuse/bin/map-services +++ b/elements/opensuse/bin/map-services @@ -23,7 +23,6 @@ import sys # distromatch or other rich data sources. # Debian name on the left, openSUSE on the right. service_map = { -<<<<<<< HEAD # openstack mapping 'cinder-api': 'openstack-cinder-api', 'cinder-scheduler': 'openstack-cinder-scheduler',