From b08a7218667e4d29c0f239f4b516e8734e6fb27d Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Mon, 2 Dec 2013 20:47:50 +0000
Subject: [PATCH] controller: Update message shown on conflicts

---
 SparkleShare/SparkleControllerBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 22ce3934..fe688671 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -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);