From d0a0d2f4bf1dacf7c1f38b968be84a5e905554a8 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 14 Mar 2017 01:26:23 +0100
Subject: [PATCH] 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>
---
 qa/suites/rgw/singleton/all/radosgw-admin.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qa/suites/rgw/singleton/all/radosgw-admin.yaml b/qa/suites/rgw/singleton/all/radosgw-admin.yaml
index e63d3ec73ad31..0c41e12411b65 100644
--- 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: