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

controller: Update message shown on conflicts

Browse source
This commit is contained in:
Hylke Bons 2013-12-02 20:47:50 +00:00
parent d5423d1888
commit b08a721866
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/SparkleControllerBase.cs
View file

@ -446,7 +446,7 @@ namespace SparkleShare {
};
repo.ConflictResolved += delegate {
AlertNotificationRaised ("Conflict happened", "Don't worry, we've made a copy of each conflicting file.");
AlertNotificationRaised ("Some files were in conflict", "Don't worry, we've kept copy of each conflicting file.");
};
this.repositories.Add (repo);