Remove accidental merge marker
Remove accidental merge marker

Change-Id: If98066c418f64be9f1bdce16558969d800e602c0

JioCloud/diskimage-builder,switch-ch/diskimage-builder,citrix-openstack-build/diskimage-builder,JioCloud/diskimage-builder,citrix-openstack-build/diskimage-builder,NaohiroTamura/diskimage-builder,varunarya10/diskimage-builder,openstack/diskimage-builder,CSC-IT-Center-for-Science/diskimage-builder,zioproto/diskimage-builder,NaohiroTamura/diskimage-builder,rdo-management/diskimage-builder,CSC-IT-Center-for-Science/diskimage-builder,openstack/diskimage-builder,takahashinobuyuki/diskimage-builder,rdo-management/diskimage-builder,varunarya10/diskimage-builder,switch-ch/diskimage-builder,eantyshev/diskimage-builder,zioproto/diskimage-builder,takahashinobuyuki/diskimage-builder,eantyshev/diskimage-builder