systemd: remove merge conflicts accidently left in

Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 03ab0d459eff5cd3eee523f847134154ff4a4162..6e5a8fb813ff1eaac4d36530f2800087c1ba7a66 100644 (file)
--- a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -110,16 +110,13 @@ index a3e639d..00736f5 100644
  have_manpages=no
  AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
  AS_IF([test "x$enable_manpages" != xno], [
-@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([
+@@ -1616,6 +1635,9 @@ AC_MSG_RESULT([
          SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
          SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
          Build Python:            ${PYTHON}
-+<<<<<<< HEAD
-+=======
 +        Installation Python:     ${PYTHON_BINARY}
 +        sphinx binary:           ${SPHINX_BUILD}
 +        firmware path:           ${FIRMWARE_PATH}
-+>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support
          PAM modules dir:         ${with_pamlibdir}
          PAM configuration dir:   ${with_pamconfdir}
          D-Bus policy dir:        ${with_dbuspolicydir}