From aee0812505a875ddd1c64f0be6c0baa4d2d58b4c Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 13 Jun 2015 23:28:01 +0200
Subject: [PATCH] Build/Graphics: Fix conflict

Former-commit-id: 48015e97d5e7a6b06406c7867f6119fa6be7c38a
---
 build/scripts/module/graphics.lua | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/build/scripts/module/graphics.lua b/build/scripts/module/graphics.lua
index 36b72a36b..9d393d3a7 100644
--- a/build/scripts/module/graphics.lua
+++ b/build/scripts/module/graphics.lua
@@ -1,18 +1,7 @@
 MODULE.Name = "Graphics"
 
-<<<<<<< HEAD
-defines "NAZARA_GRAPHICS_BUILD"
-
-files
-{
-	"../include/Nazara/Graphics/**.hpp",
-	"../include/Nazara/Graphics/**.inl",
-	"../src/Nazara/Graphics/**.hpp",
-	"../src/Nazara/Graphics/**.cpp"
-=======
 MODULE.Libraries = {
 	"NazaraCore",
 	"NazaraUtility",
 	"NazaraRenderer"
->>>>>>> origin/BuildSystem-Update
 }