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

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

(limited to 'blfs')

diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile
index a254988..7b79bd5 100644
--- a/blfs/KDE.Makefile
+++ b/blfs/KDE.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
@@ -1044,4 +1043,3 @@ Xorg_Synaptics_Driver : libevdev Xorg-Server
 
 XviD : yasm NASM
 	@echo $@
->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28
-- 
cgit v1.2.3-54-g00ecf