mirror of
https://github.com/github/gitignore
synced 2025-06-28 09:38:52 +02:00
Fix conflicts
This commit is contained in:
parent
4eb82ffd9b
commit
8789ddbda3
@ -2,6 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
|
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
|
||||||
#
|
#
|
||||||
|
.utmp/
|
||||||
/[Ll]ibrary/
|
/[Ll]ibrary/
|
||||||
/[Tt]emp/
|
/[Tt]emp/
|
||||||
/[Oo]bj/
|
/[Oo]bj/
|
||||||
@ -9,6 +10,11 @@
|
|||||||
/[Bb]uilds/
|
/[Bb]uilds/
|
||||||
/[Ll]ogs/
|
/[Ll]ogs/
|
||||||
/[Uu]ser[Ss]ettings/
|
/[Uu]ser[Ss]ettings/
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control.
|
||||||
|
*.blend1
|
||||||
|
*.blend1.meta
|
||||||
|
|
||||||
# MemoryCaptures can get excessive in size.
|
# MemoryCaptures can get excessive in size.
|
||||||
# They also could contain extremely sensitive data
|
# They also could contain extremely sensitive data
|
||||||
@ -55,10 +61,14 @@ ExportedObj/
|
|||||||
# Unity3D generated file on crash reports
|
# Unity3D generated file on crash reports
|
||||||
sysinfo.txt
|
sysinfo.txt
|
||||||
|
|
||||||
|
# Mono auto generated files
|
||||||
|
mono_crash.*
|
||||||
|
|
||||||
# Builds
|
# Builds
|
||||||
*.apk
|
*.apk
|
||||||
*.aab
|
*.aab
|
||||||
*.unitypackage
|
*.unitypackage
|
||||||
|
*.unitypackage.meta
|
||||||
*.app
|
*.app
|
||||||
|
|
||||||
# Crashlytics generated file
|
# Crashlytics generated file
|
||||||
@ -71,5 +81,11 @@ crashlytics-build.properties
|
|||||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||||
|
|
||||||
|
# Visual Scripting auto-generated files
|
||||||
|
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db
|
||||||
|
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
|
||||||
|
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
|
||||||
|
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
|
||||||
|
|
||||||
# Auto-generated scenes by play mode tests
|
# Auto-generated scenes by play mode tests
|
||||||
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*
|
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user