diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:45:36 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:45:36 -0600 |
| commit | 62c8a4e66093735f3962b311a8a8bedf158a2af6 (patch) | |
| tree | 3d3729f6c13ba9758c19f764d35d0571120995ef /blfs/Makefile | |
| parent | 1a95ae591bbbaa1071c4eb16991d5064f3be696c (diff) | |
Fix conflict
Diffstat (limited to 'blfs/Makefile')
| -rw-r--r-- | blfs/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
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 |