[libimobiledevice/f12/master: 2/2] fix merge

[Peter Robinson]

commit 4375758e30767d323b772c7408eee733ff401a19
Merge: df67861 aee101d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Nov 28 12:16:00 2010 +0000

    fix merge

 .gitignore            |    2 +-
 libimobiledevice.spec |    5 ++++-
 sources               |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 1ff50bb,83a8664..347d62c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- libimobiledevice-1.0.3.tar.bz2
 -libimobiledevice-1.0.2.tar.bz2
 -/libimobiledevice-1.0.3.tar.bz2
 -/libimobiledevice-1.0.4.tar.bz2
++libimobiledevice-1.0.4.tar.bz2