[aime] Fix merge conflict

[Christopher Meng]

commit 574e8137a54a06d6d3b7c74663ae18891443ce82
Author: Christopher Meng <i at cicku.me>
Date:   Sat Jun 21 18:15:15 2014 +0800

    Fix merge conflict

 aime.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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 at cicku.me> - 7.20140511-1
+* Sat Jun 21 2014 Christopher Meng <rpm at cicku.me> - 7.20140511-1
 - Update to 7.20140511
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.20140427-2