Dropped a git conflict marker that snuck in
Dropped a git conflict marker that snuck in

Change-Id: I56348f6ca3e7fb6f4e145f1cff7102704e806c63

openstack/openstack-manuals,potsmaster/openstack-manuals,gongysh2004/openstack-manual,openstack/openstack-manuals,potsmaster/openstack-manuals,saeki-masaki/openstack-manuals,gongysh2004/openstack-manual,AlekhyaMallina-Vedams/openstack-manuals,Akasurde/openstack-manuals,openstack/openstack-manuals,openstack/openstack-manuals,saeki-masaki/openstack-manuals,AlekhyaMallina-Vedams/openstack-manuals,Akasurde/openstack-manuals,AlekhyaMallina-Vedams/openstack-manuals,kairoaraujo/openstack-manuals,kairoaraujo/openstack-manuals