Merge pull request #13952 from smithfarm/wip-fix-merge-error

tests: fix merge error in rgw/singleton/all/radosgw-admin.yaml
ceph · Mar 14, 2017 · ce2e989 · ce2e989
2 parents 656b5b6 + d0a0d2f
commit ce2e989
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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: