From 6a9149a7eb0ef139ab78070fe52d04b8c3f37397 Mon Sep 17 00:00:00 2001
From: eroen <eroen-overlay@occam.eroen.eu>
Date: Fri, 14 Oct 2016 23:07:58 +0200
Subject: cleanup

---
 media-gfx/blender/metadata.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'media-gfx')

diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index de9644e..a8ee785 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -7,12 +7,9 @@
 	</longdescription>
 
 	<use>
-<<<<<<< current
-=======
-		<flag name="blender-game" restrict="&lt;=media-gfx/blender-2.50">
+		<flag name="blender-game">
 			Adds Game Engine support to Blender.
 		</flag>
->>>>>>> patched
 		<flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
 			Adds Game Engine support to Blender.
 		</flag>
@@ -20,12 +17,9 @@
 			Add support for Collada interchange format through
 			<pkg>media-libs/opencollada</pkg>.
 		</flag>
-<<<<<<< current
-=======
 		<flag name='verse'>
 			Adds verse clustering features to Blender.
 		</flag>
->>>>>>> patched
 		<flag name="cycles">
 			Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
 			<pkg>dev-libs/boost</pkg>).
-- 
cgit v1.2.3-65-gdbad