diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:46:48 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:46:48 -0600 |
| commit | a4280594a60f214a48e49ce7a8f7aaf5e9027949 (patch) | |
| tree | 06ed2e7f1f39d54f2ce5951fb279ced38a91a878 | |
| parent | 9b81ffeb61d4a9a4a354b8acc357974b9de43faa (diff) | |
Fix conflicts
| -rw-r--r-- | blfs/QT5.Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile index aa1e2a6..46e20bd 100644 --- a/blfs/QT5.Makefile +++ b/blfs/QT5.Makefile @@ -1,4 +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
@@ -561,4 +560,3 @@ xdg-utils : xmlto Lynx Xorg-Apps # dbus wpa_supplicant-qt : qt-everywhere @echo $@ ->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 |