[IMP] Apply pre-commit changes: Resolve conflicts

Browse Source

...

This commit is contained in:

Alexandre D. Díaz 2021-01-26 17:37:52 +01:00 committed by emagdalenaC2i

parent 16f1ce9ddb

commit f959dec61b

1 changed files with 4 additions and 4 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