From 333c7260bc1ec4add25deb6b33aff454a0a21ed2 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Sat, 16 Feb 2013 16:18:44 -0800
Subject: [PATCH] rbd: remove merge cruft

Signed-off-by: Sage Weil <sage@inktank.com>
---
 teuthology/task/rbd.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/teuthology/task/rbd.py b/teuthology/task/rbd.py
index f94be830ef495..3e63a7a279b47 100644
--- 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',
-- 
2.39.5