Add TODO annotation to the code re smashwilson#185

al-the-x · Feb 2, 2016 · c502fa7 · c502fa7
1 parent 8186595
commit c502fa7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/view/side-view.coffee b/lib/view/side-view.coffee
@@ -11,6 +11,7 @@ class SideView extends CoveringView
         @span class: 'pull-right', =>
           @button class: 'btn btn-xs inline-block-tight revert', click: 'revert', outlet: 'revertBtn', 'Revert'
           @button class: 'btn btn-xs inline-block-tight', click: 'useMe', outlet: 'useMeBtn', 'Use Me'
+          ## TODO: re #185 add another @button here that provides alternate resolutions from `ConflictedEditor`, e.g. "Keep Both"
 
   initialize: (@side, editor) ->
     @subs = new CompositeDisposable