From 4b84c558cd0ff13973b540cad471c664b85b7210 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Tue, 19 May 2015 17:22:00 -0700
Subject: [PATCH] fix(developer-bar-store): Merge conflict not resolved

---
 .../developer-bar/lib/developer-bar-store.coffee            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/internal_packages/developer-bar/lib/developer-bar-store.coffee b/internal_packages/developer-bar/lib/developer-bar-store.coffee
index fb54e3dfb..69a7e5710 100644
--- a/internal_packages/developer-bar/lib/developer-bar-store.coffee
+++ b/internal_packages/developer-bar/lib/developer-bar-store.coffee
@@ -86,7 +86,6 @@ DeveloperBarStore = Reflux.createStore
 
     @triggerThrottled(@)
 
-<<<<<<< HEAD:internal_packages/inbox-activity-bar/lib/activity-bar-store.coffee
   _onSendFeedback: ->
     {NamespaceStore,
      Contact,
@@ -127,7 +126,7 @@ DeveloperBarStore = Reflux.createStore
         <br/>
         <br/>
         <b>Environment:</b><br/>
-        I'm using Edgehill #{atom.getVersion()} and my platform is #{process.platform}-#{process.arch}.<br/>
+        I'm using Nylas Mail #{atom.getVersion()} and my platform is #{process.platform}-#{process.arch}.<br/>
         --<br/>
         #{user}<br/>
         -- Extra Debugging Data --<br/>
@@ -137,7 +136,4 @@ DeveloperBarStore = Reflux.createStore
       DatabaseStore.localIdForModel(draft).then (localId) ->
         Actions.composePopoutDraft(localId)
 
-module.exports = ActivityBarStore
-=======
 module.exports = DeveloperBarStore
->>>>>>> master:internal_packages/developer-bar/lib/developer-bar-store.coffee