[VirtualGL] VirtualGL-2.3.1-

[Gary Gatling]

commit 07a899a1220bdc174940b8c9a3f17c70937026d5
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date:   Sun Jul 22 19:26:33 2012 -0400

    VirtualGL-2.3.1-

 VirtualGL.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/VirtualGL.spec b/VirtualGL.spec
index 430e37c..8ffeb80 100644
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@ -121,13 +121,8 @@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker.so $RPM_BUILD_ROOT%{_libdir}/VirtualGL/l
 
 
 %changelog
-<<<<<<< HEAD
 * Sun Jul 22 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-8
 - removed BuildRequires:  mxml-devel. see bugzilla 839060.
-=======
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
->>>>>>> 0b6cc7aec741abed325835d76c441b4b535e093d
 
 * Sat Jul 14 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-7
 - added BuildRequires:  mxml-devel for fedora builds only.