Fixed merge conflict
This commit is contained in:
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta
Normal file → Executable file
101
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
Normal file → Executable file
101
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
Normal file → Executable file
File diff suppressed because one or more lines are too long
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta
Normal file → Executable file
0
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta
Normal file → Executable file
Reference in New Issue
Block a user