bubbles: Less 'disturbing' message on collisions

SparkleShare/SparkleControllerBase.cs

@@ -446,7 +446,8 @@ 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);