From 630ad94df83f18dd239e71cf2a176f3d9f066832 Mon Sep 17 00:00:00 2001 From: William Harrington Date: Sat, 11 Dec 2021 01:47:49 -0600 Subject: Fix conflicts --- blfs/Utils.Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile index 36db1a0..e3f2add 100644 --- a/blfs/Utils.Makefile +++ b/blfs/Utils.Makefile @@ -1,11 +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 -utiltargets = - -all: $(utiltargets) -======= # 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 @@ -353,4 +345,3 @@ Mutt : Links Lynx Aspell Cyrus-SASL GDB GnuPG2 GPGME libidn MIT_Kerberos \ Procmail : libnsl @echo $@ ->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 -- cgit v1.2.3-54-g00ecf