[chirp/f15: 9/10] Fix merge conflicts.

[Richard Shaw]

commit eb683356f839235122fedc5aef048453be2d3040
Merge: 6a2aaef 2a0e297
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 19 16:06:37 2012 -0500

    Fix merge conflicts.

 .gitignore |    2 +-
 sources    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 00167aa,f6a82f9..5111568
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/chirp-0.1.12.tar.gz
+ /chirp-0.2.0.tar.gz