From 2f9cbb78852cd1039064bf7e7354d385e7c3a43d Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 26 Feb 2014 15:12:33 +0000
Subject: fixup tbdiff moving

---
 trove.morph | 1 -
 1 file changed, 1 deletion(-)

diff --git a/trove.morph b/trove.morph
index a7abdbd..ee29b58 100644
--- a/trove.morph
+++ b/trove.morph
@@ -6,7 +6,6 @@ build-depends:
   ref: null
   morph: tools
 chunks:
-<<<<<<< HEAD
 - name: tbdiff
   repo: baserock:baserock/tbdiff
   ref: baserock/sam/trove-upgrades
-- 
cgit v1.2.1