openstack/diskimage-builder
Code Issues Proposed changes

Remove accidental merge marker

Browse Source 
Change-Id: If98066c418f64be9f1bdce16558969d800e602c0
This commit is contained in:
James Slagle 2014-02-20 15:09:44 -05:00
parent 4f795b91ed
commit 959aed3f86
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/opensuse/bin/map-services
View File

@ -23,7 +23,6 @@ import sys
# distromatch or other rich data sources. # distromatch or other rich data sources.
# Debian name on the left, openSUSE on the right. # Debian name on the left, openSUSE on the right.
service_map = { service_map = {
<<<<<<< HEAD
# openstack mapping # openstack mapping
'cinder-api': 'openstack-cinder-api', 'cinder-api': 'openstack-cinder-api',
'cinder-scheduler': 'openstack-cinder-scheduler', 'cinder-scheduler': 'openstack-cinder-scheduler',