diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:47:49 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:47:49 -0600 |
| commit | 630ad94df83f18dd239e71cf2a176f3d9f066832 (patch) | |
| tree | 71330c13ba862dd3e5628065c30f99ae76c42e6f /blfs/Utils.Makefile | |
| parent | 169bc9fd9b18767c7491f97e88259b34bf59baaa (diff) | |
Fix conflicts
Diffstat (limited to 'blfs/Utils.Makefile')
| -rw-r--r-- | blfs/Utils.Makefile | 9 |
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 |