diff options
| author | Jonathan Bauer | 2013-06-13 15:34:12 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-06-13 15:34:12 +0200 |
| commit | 24489511404cb9fd471fd3508d3021ec75fa00e1 (patch) | |
| tree | f08be51087d39084073c4737ef2cb24e086d44f5 | |
| parent | merge (diff) | |
| download | tm-scripts-24489511404cb9fd471fd3508d3021ec75fa00e1.tar.gz tm-scripts-24489511404cb9fd471fd3508d3021ec75fa00e1.tar.xz tm-scripts-24489511404cb9fd471fd3508d3021ec75fa00e1.zip | |
oops
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 5 |
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="" |