[LuxRender] Remove garbage

[Jochen Schmitt]

commit 77c2a9b44f04d1157857fee032f95a1b2bb2bb63
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Nov 23 20:00:13 2011 +0100

    Remove garbage

 LuxRender.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/LuxRender.spec b/LuxRender.spec
index 5d53f6f..f46dc93 100644
--- a/LuxRender.spec
+++ b/LuxRender.spec
@@ -225,7 +225,6 @@ install -pm 0644 %{SOURCE3} \
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Nov 23 2011 Jochen Schmitt <Jochen herr-schmitt de> - 0.8.0-7
 - Rebuilt to fix boost API change
 - Change user of blender-rpm macros