controller: Update message shown on conflicts
This commit is contained in:
parent
d5423d1888
commit
b08a721866
|
@ -446,7 +446,7 @@ namespace SparkleShare {
|
||||||
};
|
};
|
||||||
|
|
||||||
repo.ConflictResolved += delegate {
|
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);
|
this.repositories.Add (repo);
|
||||||
|
|
Loading…
Reference in a new issue