beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Uncomment out conflict event. Fixes build errors

Browse source
This commit is contained in:
Hylke Bons 2011-04-21 16:49:26 +02:00
parent 780ed8e751
commit 31289e984e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleLib/SparkleRepo.cs
View file

@ -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;