Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/normusF7/city-game
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.gitignore
  • Loading branch information
netro committed Sep 11, 2023
2 parents be636e2 + 649c370 commit 176538a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ crashlytics-build.properties

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
/[Aa]ssets/[Ss]treamingAssets/aa/*

0 comments on commit 176538a

Please sign in to comment.