From da0d771c7a56252c2504421379736fa37cdfa6d5 Mon Sep 17 00:00:00 2001
From: Ramiro Saenz <saenzramiro@gmail.com>
Date: Wed, 12 Sep 2018 14:51:27 -0300
Subject: [PATCH] Resolving conflicts

---
 app/ux/WebView.js | 2 +-
 electron/main.js  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/ux/WebView.js b/app/ux/WebView.js
index 241947c7..7fc1eee6 100644
--- a/app/ux/WebView.js
+++ b/app/ux/WebView.js
@@ -174,7 +174,7 @@ Ext.define('Rambox.ux.WebView',{
 					,plugins: 'true'
 					,allowtransparency: 'on'
 					,autosize: 'on'
-					,webpreferences: { contextIsolation:true } //,nativeWindowOpen=yes
+					,webpreferences: { contextIsolation: true } //,nativeWindowOpen=yes
 					//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
 					,useragent: Ext.getStore('ServicesList').getById(me.record.get('type')).get('userAgent')
 					,preload: './resources/js/rambox-service-api.js'
diff --git a/electron/main.js b/electron/main.js
index fe4c3317..cb0f313b 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -156,8 +156,7 @@ function createWindow () {
 		,show: !config.get('start_minimized')
 		,acceptFirstMouse: true
 		,webPreferences: {
-			nodeIntegration: true
-			,plugins: true
+			 plugins: true
 			,partition: 'persist:rambox'
 		}
 	});