[vttest] trying this one more time .....

[Adam Miller]

commit ffd71aeadf2b3ee5dcc1d508e0fb8926b026fc48
Author: Adam Miller <maxamillion at fedoraproject.org>
Date:   Tue Apr 5 10:58:22 2011 -0500

    trying this one more time .....

 vttest.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/vttest.spec b/vttest.spec
index 3a9e5fc..068be53 100644
--- a/vttest.spec
+++ b/vttest.spec
@@ -52,14 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %changelog
-<<<<<<< HEAD
 * Tue Apr 05 2011 Adam Miller <maxamillion at fedoraproject.org> - 20100830-1
 - Updated to latest upstream release
 - Added patch from dkutalek at redhat.com
-=======
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071216-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
->>>>>>> 0bf9dfeb542d674982d46c2ec7cd5df7799beacf
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20071216-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild