From 31289e984e679e887971f3e50dbef99f306f2e1a Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Thu, 21 Apr 2011 16:49:26 +0200
Subject: [PATCH] Uncomment out conflict event. Fixes build errors

---
 SparkleLib/SparkleRepo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index 8a5109c4..f5a31c1e 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -112,7 +112,7 @@ namespace SparkleLib {
         public delegate void FetchingFinishedEventHandler (object o, SparkleEventArgs args);
         public delegate void FetchingFailedEventHandler (object o, SparkleEventArgs args);
         public delegate void NewCommitEventHandler (SparkleCommit commit, string repository_path);
-//        public delegate void ConflictDetectedEventHandler (object o, SparkleEventArgs args);
+        public delegate void ConflictDetectedEventHandler (object o, SparkleEventArgs args);
         public delegate void ChangesDetectedEventHandler (object o, SparkleEventArgs args);
         public delegate void CommitEndedUpEmptyEventHandler (object o, SparkleEventArgs args);
 
@@ -125,7 +125,7 @@ namespace SparkleLib {
         public event FetchingFinishedEventHandler FetchingFinished;
         public event FetchingFailedEventHandler FetchingFailed;
         public event NewCommitEventHandler NewCommit;
-//        public event ConflictDetectedEventHandler ConflictDetected;
+        public event ConflictDetectedEventHandler ConflictDetected;
         public event ChangesDetectedEventHandler ChangesDetected;
         public event CommitEndedUpEmptyEventHandler CommitEndedUpEmpty;