diff options
Diffstat (limited to 'blfs/Xorg.Makefile')
| -rw-r--r-- | blfs/Xorg.Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile index f23862a..a773d09 100644 --- a/blfs/Xorg.Makefile +++ b/blfs/Xorg.Makefile @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Most deps like GLib, Xorg-Libs, gobject-introspection brought in from
# Systemd-Extras in main Makefile and not listed here or commented in targets
xorg = xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
@@ -372,4 +371,3 @@ Xorg-Server : libepoxy Pixman-GTK2 xcb-util-keysyms xcb-util-image \ xterm : dejavu-fonts Xorg-Apps PCRE2 # Valgrind @echo $@ ->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 |