move merge_settings to common library

[ott/bsta] / frame.1.pl

diff --git a/frame.1.pl b/frame.1.pl
index ea9db038861154b2696bea1aaa4475a8b333cd0e..60595ae0b052dd1e92300024afe455efaec60ac4 100644 (file)
--- a/frame.1.pl
+++ b/frame.1.pl
@@ -34,12 +34,12 @@ use botm_common (
        'join_path',
        'merge_url',
        'open_encoded', 'stat_encoded',
-       'http_header_line', 'http_header_content_length', 'http_header_content_disposition'
+       'http_header_line', 'http_header_content_length', 'http_header_content_disposition',
+       'merge_settings'
 );
 use bsta_lib (
        'STATE', 'INTF_STATE',
        'get_frame', 'get_password',
-       'merge_settings',
        'get_frame_file',
        'read_frame_data', 'read_default', 'read_noaccess',
        'read_settings', 'read_state', 'read_story'