diff options
| -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 |