diff options
author | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:18:23 +0200 |
---|---|---|
committer | Linus Nordberg <linus@nordberg.se> | 2014-10-08 16:18:23 +0200 |
commit | 9d2ef27d1427ef1c61c497c272a74506d651771a (patch) | |
tree | 48847b4dd27646a186b52b2040e2597fb179b3d8 /ebin | |
parent | 6bceff8e5d10eff9ca59571e80a017afae347ced (diff) | |
parent | 409ea0e5857acffe36ebc977bdce843f994a00aa (diff) |
Merge remote-tracking branch 'refs/remotes/map/fsync4' into origin-master
Conflicts:
src/db.erl
src/plop.erl
Diffstat (limited to 'ebin')
-rw-r--r-- | ebin/plop.app | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ebin/plop.app b/ebin/plop.app index d017331..a2a0dd4 100644 --- a/ebin/plop.app +++ b/ebin/plop.app @@ -6,7 +6,7 @@ [{description, "The plop store"}, {vsn, "0.2.0-dev"}, {modules, [plop_app, plop_sup, plop, db, ht, hex]}, - {applications, [kernel, stdlib, mnesia]}, % crypto, public_key + {applications, [kernel, stdlib]}, % crypto, public_key {registered, [plop, ht, db]}, {mod, {plop_app, ["test/eckey.pem", "test/eckey-public.pem"]}} ]}. |