kiss: fix conflicts bug. See #278

Browse Source

...

This commit is contained in:

Dylan Araps 2021-10-04 08:56:28 +03:00

parent ef8ef9986b

commit e58c74eb1f

No known key found for this signature in database

GPG Key ID: 13295DAC2CF13B5C

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