[python-tahrir-api: 2/2] fixed f18 rebuild merge conflict

[Ross Delinger]

commit 5cf164689fbd482d652e5455a43b8262b8d6b02f
Merge: afff65c ddea1d0
Author: Ross Delinger <rossdylan at csh.rit.edu>
Date:   Mon Jul 23 15:22:35 2012 -0400

    fixed f18 rebuild merge conflict

 python-tahrir-api.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --cc python-tahrir-api.spec
index 7f56323,229dbf1..bd676d6
--- a/python-tahrir-api.spec
+++ b/python-tahrir-api.spec
@@@ -53,11 -54,8 +53,12 @@@ database without having to use the Tahr
  %{_bindir}/initialize_tahrir_db
  
  %changelog
 +* Mon Jul 23 2012 rossdylan <rdelinge at redhat.com> 0.1.7-1
 +- Lots of misc bug fixes
 +- consolidated the 2 models back into a single version
 +- expanded the api to include more ways of interacting with the database
 +- Removed MySQL-python dependancy since tahrir-api is db agnostic
- 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3.4-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
  * Wed Jun 13 2012 rossdylan <rdelinge at redhat.com> 0.1.3.1-1
  - initial package for Fedora