[pyqt-mail-checker/f20] Version 2.1.8

[f1ash]

commit 382a96d14245a5cfdb509aeb8e2333b63e06fd75
Author: F1ash <kaperang07 at gmail.com>
Date:   Thu Jan 23 15:46:20 2014 +0400

    Version 2.1.8

 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 32bb818..4f72540 100644
--- a/pyqt-mail-checker.spec
+++ b/pyqt-mail-checker.spec
@@ -1,9 +1,5 @@
 Name: pyqt-mail-checker
-<<<<<<< HEAD
-Version: 2.0.7
-=======
 Version: 2.1.8
->>>>>>> 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
-=======
 * Thu Jan 23 2014 Fl at sh <kaperang07 at gmail.com> - 2.1.8-1
 - version updated;
 
->>>>>>> master
 * Fri Dec 27 2013 Fl at sh <kaperang07 at gmail.com> - 2.0.7-1
 - version updated;
 
diff --git a/sources b/sources
index f59493e..c75c4df 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f91d166d5f0315ab546401e10f552937  2.0.7.tar.gz
-=======
 e3e9e65ef2012c0905863f1aaaac5905  2.1.8.tar.gz
->>>>>>> master