aboutsummaryrefslogtreecommitdiffstats
path: root/blfs/Utils.Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'blfs/Utils.Makefile')
-rw-r--r--blfs/Utils.Makefile9
1 files changed, 0 insertions, 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