[pyqt-mail-checker/f18] Version 2.0.6

[f1ash]

commit 34d27e56622f25f6ad4546fde6adad99fbbe1344
Author: F1ash <kaperang07 at gmail.com>
Date:   Wed Nov 27 21:39:25 2013 +0400

    Version 2.0.6

 pyqt-mail-checker.spec |    7 -------
 sources                |    4 ----
 2 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/pyqt-mail-checker.spec b/pyqt-mail-checker.spec
index 8a7d304..0da92cc 100644
--- a/pyqt-mail-checker.spec
+++ b/pyqt-mail-checker.spec
@@ -1,9 +1,5 @@
 Name: pyqt-mail-checker
-<<<<<<< HEAD
-Version: 2.0.5
-=======
 Version: 2.0.6
->>>>>>> master
 Release: 1%{?dist}
 Summary: Applet periodically checking for new messages in the mailboxes
 Summary(ru): Апплет периодически проверяет наличие новых писем в списке почтовых ящиков
@@ -68,12 +64,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon Nov 25 2013 Fl at sh <kaperang07 at gmail.com> - 2.0.6-1
 - version updated;
 
->>>>>>> master
 * Sat Sep 14 2013 Fl at sh <kaperang07 at gmail.com> - 2.0.5-1
 - version updated;
 
diff --git a/sources b/sources
index 342a1bf..f08b18b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e8c066bba53a771f473af5faa378cfb9  2.0.5.tar.gz
-=======
 2394c457753d0c402d8bd74037c8accf  2.0.6.tar.gz
->>>>>>> master