tree 746da0fe52bb03c11a8973322a6c80d56a1eae20
parent 8f24f41a1de601eff8f7131978145812e46785bf
author Riccardo Iaconelli <riccardo.iaconelli@qredo.com> 1663076167 +0200
committer Riccardo Iaconelli <riccardo.iaconelli@qredo.com> 1663076167 +0200

fix git merge command

Signed-off-by: Riccardo Iaconelli <riccardo.iaconelli@qredo.com>