Resolve merge conflicts

Browse Source

...

This commit is contained in:

EliteMasterEric

2023-10-10 22:36:58 -04:00

parent 4b23eaea59

commit b50ccfa080

2 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

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

art

+1 -1

Submodule art updated: 1656bea537...d1aa2c6e81

assets

+1 -1

Submodule assets updated: ddc9c55a6c...2f49d84392