tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml

Introduced by 94d5888c

Reported-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin.yaml b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
index e63d3ec73ad3197cc4b736e03c7406662f88c6cb..0c41e12411b654adcfe0f2c4e626c9cefe58b79f 100644 (file)
--- a/qa/suites/rgw/singleton/all/radosgw-admin.yaml
+++ b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
@@ -4,7 +4,6 @@ openstack:
 - volumes: # attached to each instance
     count: 4
     size: 10 # GB
->>>>>>> 8af4c35f95... qa/suites/rgw: Add openstack volume configuration
 tasks:
 - install:
 - ceph: