Resolving conflicts · da0d771c7a - Rambox-CE - Gitea: Git with a cup of tea

Ramiro Saenz 7 years ago

parent

986c171d3f

commit

da0d771c7a

2 changed files with 2 additions and 3 deletions

Unified View

								
									3

electron/main.js

								Unescape
								Escape
							
									View File
								
					@ -156,8 +156,7 @@ function createWindow () {
				
							,show: !config.get('start_minimized')
					
							,show: !config.get('start_minimized')
				
							,acceptFirstMouse: true
					
							,acceptFirstMouse: true
				
							,webPreferences: {
					
							,webPreferences: {
				
								nodeIntegration: true
					
								 plugins: true
				
								,plugins: true
					
								,partition: 'persist:rambox'
					
								,partition: 'persist:rambox'
				
							}
					
							}
				
						});
					
						});