diff options
Diffstat (limited to 'trove.morph')
-rw-r--r-- | trove.morph | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/trove.morph b/trove.morph index 43569d0..a7abdbd 100644 --- a/trove.morph +++ b/trove.morph @@ -6,6 +6,11 @@ build-depends: ref: null morph: tools chunks: +<<<<<<< HEAD +- name: tbdiff + repo: baserock:baserock/tbdiff + ref: baserock/sam/trove-upgrades + build-depends: [] - name: bottle repo: upstream:bottle ref: baserock/morph |