 path = require 'path'
 fs = require 'fs'
 
-
-projectPath = path.resolve(atom.config.resourcePath, '../../project')
-
+# projectPath
+if process.platform == 'darwin'
+  resolvePath = '../../../project'
+else
+  resolvePath = '../../project'
+projectPath = path.resolve(atom.config.resourcePath, resolvePath)
 if fs.lstatSync(projectPath).isSymbolicLink()
   projectPath = fs.readlinkSync(projectPath)
   if process.platform == 'win32'

      #   # git.gitCmd args: ['rebase', '--continue']
      #   # .then () =>
      #   #   @generator.deployGhpages()
      # subs.dispose()  

#      httpServer.runChildProcess
#        root: atom.config.get('docapp.outPath')

      # pkg.onDidCompleteConflictResolution ()->
      #   console.log('onDidCompleteConflictResolution')
      #   return
      # console.log(atom.packages.getActivePackage('merge-conflicts'))
        # git.gitCmd args: ['rebase', '--continue']
        # .then () =>
        #   @generator.deployGhpages()
