move merge_settings to common library

[ott/bsta] / 2words.1.pl

diff --git a/2words.1.pl b/2words.1.pl
index 1bc2d74be5eef2d5c7ea48caa6b2960aaa8061d2..a1894c66c5aec143fba7c6016b33d48b2a4fb314 100644 (file)
--- a/2words.1.pl
+++ b/2words.1.pl
@@ -28,6 +28,8 @@ use Encode ('encode', 'decode');
 ###PERL_LIB: use lib /botm/lib/bsta
 use botm_common (
        'HTTP_STATUS',
+       'merge_settings',
+       'fail_method', 'fail_content_type',
        'http_header_status', 'http_header_allow',
        'merge_url',
        'read_header_env',
@@ -38,13 +40,11 @@ use botm_common (
 use bsta_lib (
        'STATE', 'INTF_STATE',
        'get_id',
-       'fail_method', 'fail_content_type',
        'print_html_start', 'print_html_end',
        'print_html_head_start', 'print_html_head_end',
        'print_html_body_start', 'print_html_body_end',
        'write_index',
        'get_remote_addr', 'get_password',
-       'merge_settings',
        'ong',
        'read_story', 'write_story',
        'read_settings', 'read_state'