Commit 90ea51c
Resolved a merge conflict in the asset file by removing duplicate GUID entries. The file now has a single GUID entry and is properly formatted.
Co-authored-by: Takuma Miyamoto <me@gupon.jp>
1 parent 2cc8b83 commit 90ea51c
1 file changed
Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments