[pyqt-mail-checker/f20] Version 2.1.8

[f1ash]

commit fc4326be7a1fec0f4eed9395d817b4666fefa245
Author: F1ash <kaperang07 at gmail.com>
Date:   Thu Jan 23 15:42:30 2014 +0400

    Version 2.1.8

 .gitignore             |    4 ++++
 pyqt-mail-checker.spec |   10 ++++++++++
 sources                |    4 ++++
 3 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 337eb77..ef6f7ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 /2.0.2.tar.gz
 /2.0.7.tar.gz
+<<<<<<< HEAD
+=======
+/2.1.8.tar.gz
+>>>>>>> master
diff --git a/pyqt-mail-checker.spec b/pyqt-mail-checker.spec
index 95c2f16..32bb818 100644
--- a/pyqt-mail-checker.spec
+++ b/pyqt-mail-checker.spec
@@ -1,5 +1,9 @@
 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): Апплет периодически проверяет наличие новых писем в списке почтовых ящиков
@@ -64,6 +68,12 @@ 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 aea8f08..f59493e 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 f91d166d5f0315ab546401e10f552937  2.0.7.tar.gz
+=======
+e3e9e65ef2012c0905863f1aaaac5905  2.1.8.tar.gz
+>>>>>>> master