From 63c9da02f685e8cfdae3202000fec3fae1d90f0f Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 4 Sep 2014 09:12:31 -0600
Subject: [PATCH] Add Editor::onDidConflict

---
 src/editor.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/editor.coffee b/src/editor.coffee
index 9ccce8149..ef128bfcd 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -309,6 +309,9 @@ class Editor extends Model
   onDidStopChanging: (callback) ->
     @getBuffer().onDidStopChanging(callback)
 
+  onDidConflict: (callback) ->
+    @getBuffer().onDidConflict(callback)
+
   # Retrieves the current {TextBuffer}.
   getBuffer: -> @buffer