From 9b81ffeb61d4a9a4a354b8acc357974b9de43faa Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Sat, 11 Dec 2021 01:46:28 -0600
Subject: Fix conflicts

---
 blfs/Xorg.Makefile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'blfs')

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
-- 
cgit v1.2.3-54-g00ecf