summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remote/modules/xorg/xorg.conf5
1 files changed, 0 insertions, 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=""