rbd: remove merge cruft

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index f94be830ef4953f8bdff56c80d29a376899e45cc..3e63a7a279b4746dc7df8e51654c4385cb56269a 100644 (file)
--- a/teuthology/task/rbd.py
+++ b/teuthology/task/rbd.py
@@ -213,10 +213,7 @@ def dev_create(ctx, config):
             (remote,) = ctx.cluster.only(role).remotes.keys()
             remote.run(
                 args=[
-<<<<<<< HEAD
                     'LD_LIBRARY_PATH={tdir}/binary/usr/local/lib'.format(tdir=testdir),
-=======
->>>>>>> Install ceph debs and use installed debs
                     'sudo',
                     '{tdir}/enable-coredump'.format(tdir=testdir),
                     'ceph-coverage',