[whatsup/el6: 28/28] here's a fix for the changelog entries

[David Brown]

commit 285f3b4ee3d97a30c2db9ef746f371ba7f72048b
Author: David Brown <david.brown at pnl.gov>
Date:   Tue Jul 24 10:59:08 2012 -0700

    here's a fix for the changelog entries

 whatsup.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/whatsup.spec b/whatsup.spec
index c3ff21c..ae4a6d9 100644
--- a/whatsup.spec
+++ b/whatsup.spec
@@ -255,12 +255,6 @@ fi
 * Tue Jul 24 2012 David Brown <david.brown at pnnl.gov> - 1.13-1
 - New Upstream Release
 
-* Wed Mar 17 2010 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-4
-- Rebuild to pick up new opensm
-
-* Mon Dec 21 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.9-3
-- Rebuild to pick up new opensm
-
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -312,7 +306,6 @@ fi
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.9-3
 - rebuild against perl 5.10.1
 
->>>>>>> master
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild