Skip to content

Commit

Permalink
fixed merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@mushakushi
mushakushi committed Oct 10, 2024
1 parent 310bfb0 commit a8b8922
Show file tree
Hide file tree
Showing 7 changed files with 3,695 additions and 10,237 deletions.
7,903 changes: 2,836 additions & 5,067 deletions Assets/ZombieCrossing/Art/Fonts/OpenSans-Bold SDF.asset
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/ZombieCrossing/Art/Fonts/OpenSans-Bold SDF.asset.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,689 changes: 851 additions & 2,838 deletions Assets/ZombieCrossing/Art/Fonts/OpenSans-ExtraBold SDF.asset
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Assets/ZombieCrossing/Art/Fonts/OpenSans-ExtraBold SDF.asset.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a8b8922

Please sign in to comment.