diff options
| -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 |