Fix git conflicts in spec.

Update to latest bugfix release.
Upstream Update
2013-03-14 08:13:16 -05:00 · 2013-03-14 08:12:26 -05:00 · 2012-08-03 02:02:06 -04:00
2 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -11,7 +11,11 @@ fldigi-3.20.20.tar.gz
 /fldigi-3.21.34.tar.gz
 /fldigi-3.21.35.tar.gz
 /fldigi-3.21.37.tar.gz
+<<<<<<< HEAD
+/fldigi-3.21.49.tar.gz
+=======
 /fldigi-3.21.41.tar.gz
 /fldigi-3.21.49.tar.gz
 /fldigi-3.21.68.tar.gz
 /fldigi.pdf
+>>>>>>> master
--- a/fldigi.spec
+++ b/fldigi.spec
@ -108,14 +108,14 @@ install -pm 0644 %{SOURCE1} .
 - Upstream upddate to 3.21.41
 - Fix deps for F18/Rawhide

+* Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.37-1
+- Upstream upddate to 3.21.37
+
 * Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.37-2
 - Upstream upddate to 3.21.37
 - Remove patches fixed upstream
 - Correct source URL

-* Sat Jan 28 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.37-1
- Upstream upddate to 3.21.37
-
 * Sun Jan 15 2012 Randall J. Berry, N3LRX <dp67@fedoraproject.org> - 3.21.35-2
 - Add patches for testing error correction
 - Update rawhide builds
Author	SHA1	Message	Date
Richard M. Shaw	afda660878	Fix git conflicts in spec.	2013-03-14 08:13:16 -05:00
Richard M. Shaw	a872e38704	Update to latest bugfix release.	2013-03-14 08:12:26 -05:00
Randy Berry	f64b75f718	Upstream Update	2012-08-03 02:02:06 -04:00