diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-07-28 13:38:43 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2017-07-28 13:38:43 +0200 |
| commit | 11e0bdd000dad72ed4c46d419e253ee0caefbc2b (patch) | |
| tree | 3c886c080433ce70bd23d682c730d232f2e87a3b /merge/ebin | |
| parent | 489df8ecaf16ca7429eb15b31ffbe6f686f5b0d1 (diff) | |
Still WIPmergefetch
Diffstat (limited to 'merge/ebin')
| -rw-r--r-- | merge/ebin/merge.app | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge/ebin/merge.app b/merge/ebin/merge.app index b34334a..c195185 100644 --- a/merge/ebin/merge.app +++ b/merge/ebin/merge.app @@ -6,8 +6,8 @@ {application, merge, [{description, "Plop merge"}, {vsn, "1.0.1-alpha-dev"}, - {modules, [merge_app, merge_dist, merge_dist_sup, merge_sup]}, - {applications, [kernel, stdlib, lager, plop]}, + {modules, [merge_app, merge_dist, merge_dist_sup, merge_sup, merge_fetch]}, + {applications, [kernel, stdlib, lager, catlfish, plop]}, {registered, [merge_dist, merge_dist_sup, merge_sup]}, {mod, {merge_app, []}} ]}. |