From 62c8a4e66093735f3962b311a8a8bedf158a2af6 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Sat, 11 Dec 2021 01:45:36 -0600 Subject: Fix conflict --- blfs/Makefile | 2 -- 1 file changed, 2 deletions(-) (limited to 'blfs') diff --git a/blfs/Makefile b/blfs/Makefile index 8a1c7c4..d00e9c7 100644 --- a/blfs/Makefile +++ b/blfs/Makefile @@ -1,4 +1,3 @@ -<<<<<<< HEAD targets = wpa_supplicant wget desktop-file-utils \ libpwquality OpenSSH shared-mime-info Systemd-Extras @@ -1056,4 +1055,3 @@ include QT5.Makefile include KDE.Makefile include Utils.Makefile include Extras.Makefile ->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 -- cgit v1.2.3-54-g00ecf