]> code.ossystems Code Review - openembedded-core.git/commit
systemd: remove merge conflicts accidently left in
authorRoss Burton <ross.burton@intel.com>
Thu, 17 Dec 2015 20:57:01 +0000 (20:57 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 22 Dec 2015 16:08:43 +0000 (16:08 +0000)
commit1e49b502e730d51420682aa9b57628ae113fe0b2
tree0efec506007dd1aade8ce3827580c2a97f632011
parentd1ff1fef987457eb1a5ffe42dbabc7808fa7d598
systemd: remove merge conflicts accidently left in

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch