Fixed merge conflict issues.

This commit is contained in:
Akshay Joshi
2025-07-17 12:44:53 +05:30
parent d26b63fdf5
commit fe2332f606
2 changed files with 3 additions and 10 deletions
-6
View File
@@ -206,12 +206,6 @@ define('pgadmin.browser', [
uiloaded: function() {
this.set_master_password('');
this.check_version_update();
const prefStore = usePreferences.getState();
let save_the_workspace = prefStore.getPreferencesForModule('misc').save_app_state;
if(save_the_workspace){
this.restore_pgadmin_state();
pgBrowser.docker.default_workspace.focus();
}
// Assign and Update shortcuts from preferences.
MainMenuFactory.subscribeShortcutChanges();
},