Fixed merge conflict issues.

Author: akshay-joshi

web/pgadmin/browser/static/js/browser.js

@@ -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();
     },

web/pgadmin/settings/static/ApplicationStateProvider.jsx

@@ -27,7 +27,7 @@ export function ApplicationStateProvider({children}){
   const saveToolData = (toolName, connectionInfo, transId, toolData) =>{
     let data = {
       'tool_name': toolName,
-      'connection_info': connectionInfo, 
+      'connection_info': connectionInfo,
       'trans_id': transId,
       'tool_data': toolData
     };
@@ -57,7 +57,7 @@ export function ApplicationStateProvider({children}){
         console.warn('Unable to retrieve tool content.');
         return null;
       }
-      
+
       const toolData = res.data.data.result;
       const connectionInfo = toolData?.connection_info;
       const toolContent = JSON.parse(toolData.tool_data);
@@ -83,7 +83,6 @@ export function ApplicationStateProvider({children}){
     } catch (error) {
       let errorMsg = gettext(error?.response?.data?.errormsg || error);
       console.warn(errorMsg);
-      pgAdmin.Browser.notifier.pgRespErrorNotify(errorMsg);
       return null;
     }
   }
@@ -113,4 +112,4 @@ export function ApplicationStateProvider({children}){
 
 ApplicationStateProvider.propTypes = {
   children: PropTypes.object,
-};
+};