Resolve merge conflicts

Browse Source

Signed-off-by: AnErrupTion <anerruption@disroot.org>

...

This commit is contained in:

AnErrupTion 2024-05-04 20:54:01 +02:00

parent e3b960b68b 4ee2b3ecc7

commit 6af4b83622

No known key found for this signature in database

GPG Key ID: 3E85EB44F610AD7F

4 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