diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-13 15:09:18 +0000 |
| commit | 50f602fe6b12943a3847fb1925b1e5cb554bed97 (patch) | |
| tree | 2a2ff973dafefa91abcf3295fbca155de6414127 /strata/trove.morph | |
| parent | 655a27dd00b54302978076523f784fe98e5a684f (diff) | |
| parent | fe37ca6dfc32f13e89975f916abb0d95b9b4f09b (diff) | |
| download | infrastructure-50f602fe6b12943a3847fb1925b1e5cb554bed97.tar.gz | |
Merge remote-tracking branch 'baserock/master'
Conflicts:
scripts/licensecheck.sh
strata/lorry-controller.morph
strata/trove.morph
Diffstat (limited to 'strata/trove.morph')
| -rw-r--r-- | strata/trove.morph | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/strata/trove.morph b/strata/trove.morph index 665f7d9a..40588c05 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: lace morph: strata/trove/lace.morph repo: upstream:gitano/lace @@ -69,13 +68,11 @@ chunks: repo: upstream:cgit ref: acbf4a15e260c711094455dbef7c024f2553fd32 unpetrify-ref: baserock/morph - build-depends: [] - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master - build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt |