[folks/f16: 6/6] Fix merge conflicts

[Brian Pepple]

commit 0d5aa9f20e8f966bd7bcf16e81f60119b6c7bcce
Merge: df6d583 d0f6584
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Fri Nov 11 11:06:31 2011 -0500

    Fix merge conflicts

 .gitignore |    3 +++
 folks.spec |   21 +++++++++++++++------
 sources    |    3 ++-
 3 files changed, 20 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index faee759,cc26404..02beaa0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,6 +1,7 @@@
  /folks-0.6.3.tar.xz
  /folks-0.6.3.1.tar.xz
  /folks-0.6.3.2.tar.xz
+ /folks-0.6.4.tar.xz
  /folks-0.6.4.1.tar.xz
+ /folks-0.6.5.tar.xz
++
diff --cc sources
index 09d050c,fe1d1f7..accfd3e
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- aff70a91b3c5d688f1dfae4f734b15fe  folks-0.6.4.1.tar.xz
+ 31dce2251d3ab3323ac098eda820de1c  folks-0.6.5.tar.xz
++