From 24489511404cb9fd471fd3508d3021ec75fa00e1 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 13 Jun 2013 15:34:12 +0200
Subject: oops

---
 remote/modules/xorg/xorg.conf | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index a3e5e6a0..74d162e7 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -41,13 +41,8 @@ REQUIRED_BINARIES="	Xorg
 			xkbbell 
 			xkbevd 
 			vmmouse_detect"
-<<<<<<< HEAD
 REQUIRED_DIRECTORIES="
 			/usr/lib 
 			/usr/share/X11
 "
-=======
-REQUIRED_DIRECTORIES="	/usr/lib 
-			/usr/share/X11"
->>>>>>> a39f240dae983bdb9e2ba081483f55e8dfdc2e43
 REQUIRED_FILES=""
-- 
cgit v1.2.3-55-g7522