[git commit] DEVELOPERS: merge Hervé Codina entries
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: 2021-12-17 21:48:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=131fc393464b575a0bf79332427123a9fd4ccfa0 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Probably due to bogus merge conflicts, Herv�� Codina ended up having two entries in the DEVELOPERS file. This commit brings back all files watch by Herv�� under the same entry. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- DEVELOPERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/DEVELOPERS b/DEVELOPERS
index de960d25b0..03315a5444 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS@@ -1164,14 +1164,12 @@ F: package/modsecurity2/ F: package/php-apcu/ F: package/php-lua/ F: package/php-pam/ +F: package/php-pecl-dbus/ F: support/testing/tests/package/test_dtbocfg.py F: support/testing/tests/package/test_lua_augeas.py F: support/testing/tests/package/test_php_apcu.py F: support/testing/tests/package/test_php_lua.py F: support/testing/tests/package/test_php_pam.py - -N: Herv�� Codina <herve.codina@bootlin.com> -F: package/php-pecl-dbus/ F: support/testing/tests/package/test_php_pecl_dbus.py N: Hiroshi Kawashima <kei-k@ca2.so-net.ne.jp>