Solve conflict #2

Browse Source

...

This commit is contained in:

stilobique-surface

2021-05-13 20:31:47 +02:00

parent 5cc53fca02

commit 92f1fc6f4f

14 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

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

assets/props/parchment/materials/MA_PaperParchment.material

BIN

Binary file not shown.