diff options
| author | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:47:06 -0600 |
|---|---|---|
| committer | William Harrington <kb0iic@berzerkula.org> | 2021-12-11 01:47:06 -0600 |
| commit | 169bc9fd9b18767c7491f97e88259b34bf59baaa (patch) | |
| tree | 03da185603f4d5bf32a64e116d8bfa40d090f6e6 /blfs/KDE.Makefile | |
| parent | a4280594a60f214a48e49ce7a8f7aaf5e9027949 (diff) | |
Fix conflicts
Diffstat (limited to 'blfs/KDE.Makefile')
| -rw-r--r-- | blfs/KDE.Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/blfs/KDE.Makefile b/blfs/KDE.Makefile index a254988..7b79bd5 100644 --- a/blfs/KDE.Makefile +++ b/blfs/KDE.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
@@ -1044,4 +1043,3 @@ Xorg_Synaptics_Driver : libevdev Xorg-Server XviD : yasm NASM @echo $@ ->>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28 |