fix conflict with master branch
authorwang biao <biao716.wang@samsung.com>
Tue, 18 Jun 2024 08:51:20 +0000 (16:51 +0800)
committerwang biao <biao716.wang@samsung.com>
Tue, 18 Jun 2024 08:51:20 +0000 (16:51 +0800)
commitdf0e3203d92e648250eaa59f63dc7430755f4b28
tree532eb179330ec833e4a5d7a609916ed9841e5256
parent7f68bf5b99cc328f009ff3711356ad63c680404a
parent8ee0387e88d87bcf31b4faa4b309d2e242954d5e
fix conflict with master branch

Change-Id: I57cb6adf80b8a840c0cde3fc0278690daa4771b4
Signed-off-by: wang biao <biao716.wang@samsung.com>
gitbuildsys/utils.py
tests/test_passwdx.py