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

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

(limited to 'blfs')

diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index aa1e2a6..46e20bd 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Most deps like GLib, Xorg, gobject-introspection brought in from
 # Systemd-Extras and Xorg in main and Xorg Makefiles and not listed 
 # here or commented in targets
@@ -561,4 +560,3 @@ xdg-utils : xmlto Lynx Xorg-Apps # dbus
 
 wpa_supplicant-qt : qt-everywhere
 	@echo $@
->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
-- 
cgit v1.2.3-54-g00ecf