[APLpy/f16: 5/5] Fix merge

[Germán A. Racca]

commit e805307dd306c447f593b648b4dd746291dbbce5
Merge: 12f4b31 097ecbf
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Fri May 4 14:14:07 2012 -0300

    Fix merge

 .gitignore |    2 +-
 APLpy.spec |   19 +++++++++++++------
 sources    |    2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index eb815e1,331a741..07cde82
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/APLpy-0.9.6.tar.gz
+ /APLpy-0.9.8.tar.gz