From c90251764d08afca0f199f106085d82ae1620f76 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 23 May 2010 18:46:25 +0100
Subject: [PATCH] show a notification when a conflict happens

---
 SparkleShare/SparkleRepo.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/SparkleShare/SparkleRepo.cs b/SparkleShare/SparkleRepo.cs
index 553cb228..a54d53f0 100644
--- a/SparkleShare/SparkleRepo.cs
+++ b/SparkleShare/SparkleRepo.cs
@@ -268,6 +268,12 @@ namespace SparkleShare {
 							Process.WaitForExit ();
 							Process.Start();
 
+							ShowEventBubble ("A mid-air collision happened!\n" +
+							                 "SparkleShare made a copy of your file.",
+										        SparkleHelpers.GetIcon
+										        ("folder-sparkleshare", 48),
+										        true);
+
 						}
 
 					}