[chirp/f16: 3/3] Fix conflicts.

[Richard Shaw]

commit 24f317587f8bb52bc7ad125e1cf45223a5bf3aeb
Merge: 42e3925 fea9bb9
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Jun 4 11:20:39 2012 -0500

    Fix conflicts.

 .gitignore                |    4 +++-
 chirp-0.2.0-install.patch |   23 -----------------------
 chirp-0.2.2-install.patch |   10 ++++++++++
 chirp.spec                |    8 ++++++--
 sources                   |    2 +-
 5 files changed, 20 insertions(+), 27 deletions(-)
---