[smb4k] New upstream and bugfix release.

[Sérgio Monteiro Basto]

commit cfa5bbdd17137fcf7f288f80c86720831bcefe28
Author: Sérgio Basto <sergio at serjux.com>
Date:   Sun Mar 10 17:40:48 2013 +0000

    New upstream and bugfix release.

 smb4k.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/smb4k.spec b/smb4k.spec
index 16a989a..04c3a06 100644
--- a/smb4k.spec
+++ b/smb4k.spec
@@ -1,11 +1,6 @@
 Name:		smb4k
-<<<<<<< HEAD
 Version:	1.0.6
 Release:	1%{?dist}
-=======
-Version:	1.0.5
-Release:	2%{?dist}
->>>>>>> da75b611c53c0ee025ae9b005886930eef402ea5
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet