github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-26 07:19:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Resolve merge conflict

Browse Source
This commit is contained in:
simurai
2016-10-15 20:53:02 +09:00
parent 2571bbc6f2
commit f13fd74342
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main-process/atom-application.coffee
View File

@@ -84,11 +84,7 @@ class AtomApplication
initialize: (options) ->
global.atomApplication = this
<<<<<<< HEAD
@config.onDidChange 'core.titleBar', @promptForRestart
=======
@config.onDidChange 'core.useCustomTitleBar', @promptForRestart.bind(this)
>>>>>>> master
@config.onDidChange 'core.titleBar', @promptForRestart.bind(this)
@autoUpdateManager = new AutoUpdateManager(
@version, options.test or options.benchmark or options.benchmarkTest, @resourcePath, @config