fix(build): Fix bad merge when landing previous feature.

This commit is contained in:
Ben Gotow 2015-05-13 13:08:46 -07:00
parent 5b7ae0ad54
commit f3bb8a55a2

View file

@ -7,6 +7,9 @@ Actions = require '../actions'
Thread = require '../models/thread' Thread = require '../models/thread'
AddRemoveTagsTask = require '../tasks/add-remove-tags' AddRemoveTagsTask = require '../tasks/add-remove-tags'
{Listener, Publisher} = require '../modules/reflux-coffee'
CoffeeHelpers = require '../coffee-helpers'
### ###
Public: The FocusedContentStore provides access to the objects currently selected Public: The FocusedContentStore provides access to the objects currently selected
or otherwise focused in the window. Normally, focus would be maintained internally or otherwise focused in the window. Normally, focus would be maintained internally
@ -49,6 +52,10 @@ _onFocusChanged: ->
Section: Stores Section: Stores
### ###
class FocusedContentStore class FocusedContentStore
@include: CoffeeHelpers.includeModule
@include Publisher
@include Listener
constructor: -> constructor: ->
@_resetInstanceVars() @_resetInstanceVars()