# Conflicts:
#	ar_game1/Library/CurrentLayout.dwlt
#	ar_game1/Library/EditorUserBuildSettings.asset
#	ar_game1/Library/LastSceneManagerSetup.txt
#	ar_game1/Library/ProjectSettings.asset
#	ar_game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
#	ar_game1/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
#	ar_game1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll
#	ar_game1/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
#	ar_game1/Library/assetDatabase3
#	ar_game1/Library/metadata/00/00000000000000002000000000000000
#	ar_game1/Library/metadata/00/00000000000000003000000000000000
#	ar_game1/Library/metadata/00/00000000000000004000000000000000
#	ar_game1/Library/metadata/00/00000000000000004100000000000000
#	ar_game1/Library/metadata/00/00000000000000005000000000000000
#	ar_game1/Library/metadata/00/00000000000000005100000000000000
#	ar_game1/Library/metadata/00/00000000000000006000000000000000
#	ar_game1/Library/metadata/00/00000000000000006100000000000000
#	ar_game1/Library/metadata/00/00000000000000007000000000000000
#	ar_game1/Library/metadata/00/00000000000000007100000000000000
#	ar_game1/Library/metadata/00/00000000000000008000000000000000
#	ar_game1/Library/metadata/00/00000000000000009000000000000000
#	ar_game1/Library/metadata/00/0000000000000000a000000000000000
#	ar_game1/Library/metadata/00/0000000000000000a100000000000000
#	ar_game1/Library/metadata/00/0000000000000000b000000000000000
#	ar_game1/Library/metadata/00/0000000000000000c000000000000000
#	ar_game1/Library/metadata/00/0000000000000000e100000000000000
#	ar_game1/Library/metadata/0d/0d3bb855445e36e479c85976fc88383a
#	ar_game1/Library/metadata/12/12fd8a0055b84bb59e84c9835a37e333
#	ar_game1/Library/metadata/19/19609c7b48fe4c44cb8c49e226a60947.info
#	ar_game1/Library/metadata/1c/1c6d1fbb51834b64847b1b73a75bfc77
#	ar_game1/Library/metadata/1e/1e6064201aec772479ee7b12e4d43b45
#	ar_game1/Library/metadata/21/21eff446d50eaf44a85985cd4c0b6fa1
#	ar_game1/Library/metadata/26/2682a692a2be7e14e901a738c7806da0
#	ar_game1/Library/metadata/2f/2fe3476eabbbb6c448e6b55a2cc471f5
#	ar_game1/Library/metadata/30/30aa2886e2b748d48fbe4b155c65025f
#	ar_game1/Library/metadata/32/32188fd89022c154c81befa2f0e00be0
#	ar_game1/Library/metadata/32/328cc881519068e4eb7db4bb907ad2d9
#	ar_game1/Library/metadata/38/38c8faf1788024c02930a0c68a6e0edc
#	ar_game1/Library/metadata/3a/3a84de5cd0624681b6b6dcd8921d912a
#	ar_game1/Library/metadata/40/405b9b51bb344a128608d968297df79c
#	ar_game1/Library/metadata/41/4113173d5e95493ab8765d7b08371de4
#	ar_game1/Library/metadata/49/49f5766d0d4954f44b85d4bbd7131677
#	ar_game1/Library/metadata/4a/4a3ecb1425d14502837abea459cf2b70
#	ar_game1/Library/metadata/4b/4b3fa4bde7f1451a8218c03ee6a8ded8
#	ar_game1/Library/metadata/4b/4ba2329b63d54f0187bcaa12486b1b0f
#	ar_game1/Library/metadata/51/517af1b5b81b93b43b9745d58f017562
#	ar_game1/Library/metadata/53/53ebcfaa2e1e4e2dbc85882cd5a73fa1
#	ar_game1/Library/metadata/57/5782f9e9e6e0bb94bac99aeea24814fc
#	ar_game1/Library/metadata/5b/5b32c2d36abe44540bed74c1f787033b.info
#	ar_game1/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7
#	ar_game1/Library/metadata/69/6981461fe431401459211818212a29cf
#	ar_game1/Library/metadata/6a/6a10b2909283487f913b00d94cd3faf5
#	ar_game1/Library/metadata/6e/6ec706981a919c3489f0b061a40054e2.info
#	ar_game1/Library/metadata/75/75799de484ac4f4cadc268d2cbea830a
#	ar_game1/Library/metadata/76/7668179ede524d6396c8b7d84461ea29
#	ar_game1/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
#	ar_game1/Library/metadata/84/844f815391db42d49455cbf1a7bfc434
#	ar_game1/Library/metadata/84/84ca94c19f25ae14d83aa41bb3654390
#	ar_game1/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba
#	ar_game1/Library/metadata/8e/8e7066e382b0fc749b25dbb1a3004dfe
#	ar_game1/Library/metadata/90/9078b7128e594410d9b89e5b24cffd01
#	ar_game1/Library/metadata/ad/adebbd281f1a4ef3a30be7f21937e02f
#	ar_game1/Library/metadata/b2/b2b693dffac3a4433b3114fea0b7fd4e
#	ar_game1/Library/metadata/b2/b2bead50dbf86924f8e51f03ddbebf70
#	ar_game1/Library/metadata/b5/b5da970776034f77a070d99423d68791
#	ar_game1/Library/metadata/b8/b8a0574e92bd43a59e19d6c3c6ae54c7
#	ar_game1/Library/metadata/c7/c768acbc9cf24d398488bb4c93b91288
#	ar_game1/Library/metadata/d0/d05b96cee66e14240838de167097537a
#	ar_game1/Library/metadata/d3/d33d54853fd0f48e0ac8a63ea91e6626
#	ar_game1/Library/metadata/d9/d91035c548f23744c9bfb107348ed1c0
#	ar_game1/Library/metadata/dc/dc443db3e92b4983b9738c1131f555cb
#	ar_game1/Library/metadata/e1/e1007cd261c84053beb0c3537782908d
#	ar_game1/Library/metadata/e4/e4f4cf1b9b434137a499903a7a1d651a
#	ar_game1/Library/metadata/ea/ead147da21254ff9a0a936bdd75e1680
#	ar_game1/Library/metadata/ed/ed7343f30e3843b3afda8f8b02669cea
#	ar_game1/Library/metadata/f5/f59658aa5dec15c4a86d10a247e587b7.info
#	ar_game1/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8
#	ar_game1/Library/metadata/f7/f70555f144d8491a825f0804e09c671c
#	ar_game1/Library/metadata/f7/f7b54ff4a43d4fcf81b4538b678e0bcc
#	ar_game1/Library/shadercompiler-UnityShaderCompiler.exe0.log
#	ar_game1/ProjectSettings/ProjectSettings.asset

# 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