From da0c70e8ea7463556f4dba5da9985150f01b43cf Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sat, 19 Apr 2014 11:26:47 +0100
Subject: [PATCH] bubbles: Less 'disturbing' message on collisions

---
 SparkleShare/SparkleControllerBase.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index fe688671..75dc4cc0 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -446,12 +446,13 @@ namespace SparkleShare {
             };
 
             repo.ConflictResolved += delegate {
-                AlertNotificationRaised ("Some files were in conflict", "Don't worry, we've kept copy of each conflicting file.");
+                AlertNotificationRaised ("Resolved a file collision",
+                    "Local and server versions were kept.");
             };
 
             this.repositories.Add (repo);
             this.repositories.Sort ((x, y) => string.Compare (x.Name, y.Name));
-            repo.Initialize ();
+            repo.Initialize (); 
         }