move merge_settings to common library

[ott/bsta] / reset.1.pl

diff --git a/reset.1.pl b/reset.1.pl
index 9aa95418b656d4ea255f9f5f1a9c0a324c495f65..f57cf9c3681dcbb9f9048deda43415c994a218b7 100644 (file)
--- a/reset.1.pl
+++ b/reset.1.pl
@@ -28,12 +28,12 @@ use Encode ('encode', 'decode');
 use botm_common (
        'write_data_file',
        'opendir_encoded', 'readdir_decoded', 'unlink_encoded',
-       'join_path'
+       'join_path',
+       'merge_settings'
 );
 use bsta_lib (
        'STATE', 'INTF_STATE', 'CHAT_STATE',
        'write_index',
-       'merge_settings',
        'get_page_file', 'get_frame_file',
        'read_settings', 'read_default', 'read_frame_data', 'read_attachment', 'read_state'
 );