summaryrefslogtreecommitdiff
path: root/src/plop_app.erl
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2014-10-29 16:35:44 +0100
committerLinus Nordberg <linus@nordberg.se>2014-10-29 16:56:48 +0100
commit92f681e1cbb444317d2603994c60c02feeab32be (patch)
treeef62cdfece8c1f063cb27cf299094e1f4d7eed1a /src/plop_app.erl
parentb15f4636337c45b487651e8d442afed0d4141725 (diff)
parentcc2aaa2807bb13f4683c2d74a414d39d5b29a372 (diff)
Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge
Conflicts: src/db.erl src/frontend.erl src/index.erl src/plop.erl src/storage.erl src/ts.erl
Diffstat (limited to 'src/plop_app.erl')
-rw-r--r--src/plop_app.erl4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plop_app.erl b/src/plop_app.erl
index f90792d..767bf06 100644
--- a/src/plop_app.erl
+++ b/src/plop_app.erl
@@ -4,10 +4,6 @@
-module(plop_app).
-behaviour(application).
-export([start/2, stop/1]).
--export([install/1]).
-
-install(Nodes) ->
- db:init_db(Nodes).
start(normal, Args) ->
plop_sup:start_link(Args).