Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-01-07 08:37:49 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(developer-bar-store): Merge conflict not resolved

Browse source
This commit is contained in:
Ben Gotow 2015-05-19 17:22:00 -07:00
parent 07cd16a491
commit 4b84c558cd
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal_packages/developer-bar/lib/developer-bar-store.coffee
View file

@ -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