# Conflicts:
#	ar_game1/Assets/GameObject (1)Timeline.playable
#	ar_game1/Assets/Scenes/New_Year_Dog 2.unity
#	ar_game1/Library/CurrentLayout.dwlt
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
#	ar_game1/Library/Timeline/51c6f537f0ce8d94bbdd1eac6256904f.pref
#	ar_game1/Library/assetDatabase3
#	ar_game1/Library/expandedItems
#	ar_game1/Library/metadata/00/00000000000000004000000000000000
#	ar_game1/Library/metadata/00/00000000000000005100000000000000
#	ar_game1/Library/metadata/00/00000000000000008000000000000000
#	ar_game1/Library/metadata/00/00000000000000009000000000000000
#	ar_game1/Library/metadata/00/0000000000000000b000000000000000
#	ar_game1/Library/shadercompiler-UnityShaderCompiler.exe0.log