diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:46:28 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:46:28 -0600 |
| commit | 9b81ffeb61d4a9a4a354b8acc357974b9de43faa (patch) | |
| tree | 96500ab4cc0d419ac7bb3f36771c7e5e4e655ca7 | |
| parent | 62c8a4e66093735f3962b311a8a8bedf158a2af6 (diff) | |
Fix conflicts
| -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 |