summaryrefslogtreecommitdiff
path: root/src/client/main.js
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-03-04 00:05:57 +0200
committerAlon Levy <alon@pobox.com>2015-03-04 00:05:57 +0200
commit5ecc2b10d32e257518a771f5a6c0244fc3ac9569 (patch)
tree53bb1e020b6d79e3681a47e24290605f453f3c7c /src/client/main.js
parentc7e98ed7a5ffb6a8e555a9e2e78eec5ed3c12ef7 (diff)
client: s/setup_merge_button/setup_toolbar/
Diffstat (limited to 'src/client/main.js')
-rw-r--r--src/client/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/main.js b/src/client/main.js
index 640651dc..e615ce9a 100644
--- a/src/client/main.js
+++ b/src/client/main.js
@@ -47,7 +47,7 @@ function(textanalysis_ui, textanalysis, buttons, history, drag_n_drop,
model_core.init(rz_config);
textanalysis.init(rz_core.main_graph);
search.init();
- selection.setup_merge_button(rz_core.main_graph);
+ selection.setup_toolbar(rz_core.main_graph);
$.feedback({ajaxURL: rz_config.feedback_url});
}