diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 15:12:33 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 15:13:12 +0000 |
| commit | 2f9cbb78852cd1039064bf7e7354d385e7c3a43d (patch) | |
| tree | e0764cf5b4dade4dea09999f6e77d3db6f9cb262 | |
| parent | 9484843dc4cc97cce35dd1cf2efd34b724c57f85 (diff) | |
| download | morphs-2f9cbb78852cd1039064bf7e7354d385e7c3a43d.tar.gz | |
fixup tbdiff moving
| -rw-r--r-- | trove.morph | 1 |
1 files changed, 0 insertions, 1 deletions
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 |