github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add Editor::onDidConflict

Browse Source
This commit is contained in:
Nathan Sobo
2014-09-04 09:12:31 -06:00
committed by Ben Ogle
parent 5a02303b58
commit 63c9da02f6
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/editor.coffee
View File

@@ -309,6 +309,9 @@ class Editor extends Model
onDidStopChanging: (callback) ->
@getBuffer().onDidStopChanging(callback)
onDidConflict: (callback) ->
@getBuffer().onDidConflict(callback)
# Retrieves the current {TextBuffer}.
getBuffer: -> @buffer