[chirp/f16: 10/11] Copy spec from master.

[Richard Shaw]

commit 798a598abcf8b44e934c131b2f54ec5c6071b283
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Mon Mar 19 15:54:52 2012 -0500

    Copy spec from master.

 chirp.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/chirp.spec b/chirp.spec
index 3098d17..f678a04 100644
--- a/chirp.spec
+++ b/chirp.spec
@@ -60,7 +60,6 @@ desktop-file-install \
 * Sun Mar 18 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.2.0-1
 - Update to latest upstream release.
 
->>>>>>> master
 * Sun Nov 20 2011 Randall "Randy" Berry, N3LRX <dp67 at fedoraproject.org> - 0.1.12-5
 - Add source for .desktop, per review