From 574e8137a54a06d6d3b7c74663ae18891443ce82 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Jun 21 2014 10:15:15 +0000
Subject: Fix merge conflict


---

diff --git a/aime.spec b/aime.spec
index 324ea7f..3935eee 100644
--- a/aime.spec
+++ b/aime.spec
@@ -58,7 +58,7 @@ fi
 %{_includedir}/%{name}.h
 
 %changelog
-* Fri May 30 2014 Christopher Meng <rpm@cicku.me> - 7.20140511-1
+* Sat Jun 21 2014 Christopher Meng <rpm@cicku.me> - 7.20140511-1
 - Update to 7.20140511
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.20140427-2