[usbmuxd/f12/master: 19/19] fix merge

[Peter Robinson]

commit 7b7efba03ffef9cf6c2c5f65b52b24bd2bd108ba
Merge: 1b20a14 fe47733
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Oct 24 18:56:33 2010 +0100

    fix merge

 .gitignore   |    2 +-
 sources      |    2 +-
 usbmuxd.spec |    6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4aed81d,466c753..5c32291
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--usbmuxd-1.0.5.tar.bz2
 -/usbmuxd-1.0.6.tar.bz2
++usbmuxd-1.0.6.tar.bz2