From f13fd74342f5155eefd6365c41dc82fa09c9c946 Mon Sep 17 00:00:00 2001 From: simurai Date: Sat, 15 Oct 2016 20:53:02 +0900 Subject: [PATCH] :art: Resolve merge conflict --- src/main-process/atom-application.coffee | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee index e829b32bc..8d1509e38 100644 --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee @@ -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