fix erroneously-resolved merge conflict

Browse Source

Change-Id: I4278e3e444eec93c418dfe153f60404f9848a20a
Signed-off-by: Parshintsev Anatoly <anatoly.parshintsev@syntacore.com>

...

This commit is contained in:

Parshintsev Anatoly 2023-11-29 20:49:00 +03:00

parent e9484bab54

commit 10af616067

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files