resolving conflict

Assets/TextMesh Pro/Resources/Fonts & Materials.meta

@@ -1,9 +1,22 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+guid: d99e32a5bc9dc064fb20a56ce6f208e6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+=======
+>>>>>>> origin/main
 guid: 731f1baa9d144a9897cb1d341c2092b8
 folderAsset: yes
 timeCreated: 1442040525
 licenseType: Pro
 DefaultImporter:
+<<<<<<< HEAD
+=======
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -2,20 +2,35 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2180264
 Material:
+<<<<<<< HEAD
   serializedVersion: 6
+=======
+  serializedVersion: 8
+>>>>>>> origin/main
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Material
   m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
+<<<<<<< HEAD
   m_ShaderKeywords: 
+=======
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+>>>>>>> origin/main
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+<<<<<<< HEAD
+=======
+  m_LockedProperties: 
+>>>>>>> origin/main
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -67,6 +82,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+<<<<<<< HEAD
+=======
+    m_Ints: []
+>>>>>>> origin/main
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -148,6 +167,11 @@ Material:
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+<<<<<<< HEAD
+=======
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
+>>>>>>> origin/main
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -161,11 +185,14 @@ MonoBehaviour:
   m_Name: LiberationSans SDF - Fallback
   m_EditorClassIdentifier: 
   m_Version: 1.1.0
+<<<<<<< HEAD
   m_Material: {fileID: 2180264}
   m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
   m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
+=======
+>>>>>>> origin/main
   m_FaceInfo:
     m_FaceIndex: 0
     m_FamilyName: Liberation Sans
@@ -188,6 +215,7 @@ MonoBehaviour:
     m_StrikethroughOffset: 18
     m_StrikethroughThickness: 6.298828
     m_TabWidth: 24
+<<<<<<< HEAD
   m_GlyphTable: []
   m_CharacterTable: []
   m_AtlasTextures:
@@ -239,6 +267,10 @@ MonoBehaviour:
     m_MarkToMarkAdjustmentRecords: []
   fallbackFontAssets: []
   m_FallbackFontAssetTable: []
+=======
+  m_Material: {fileID: 2180264}
+  m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
+>>>>>>> origin/main
   m_CreationSettings:
     sourceFontFileName: 
     sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
@@ -258,6 +290,39 @@ MonoBehaviour:
     fontStyleModifier: 0
     renderMode: 4169
     includeFontFeatures: 1
+<<<<<<< HEAD
+=======
+  m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 1
+  InternalDynamicOS: 0
+  m_GlyphTable: []
+  m_CharacterTable: []
+  m_AtlasTextures:
+  - {fileID: 28268798066460806}
+  m_AtlasTextureIndex: 0
+  m_IsMultiAtlasTexturesEnabled: 1
+  m_GetFontFeatures: 1
+  m_ClearDynamicDataOnBuild: 1
+  m_AtlasWidth: 512
+  m_AtlasHeight: 512
+  m_AtlasPadding: 9
+  m_AtlasRenderMode: 4169
+  m_UsedGlyphRects: []
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 0
+    m_Width: 511
+    m_Height: 511
+  m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
+    m_GlyphPairAdjustmentRecords: []
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
+  m_FallbackFontAssetTable: []
+>>>>>>> origin/main
   m_FontWeightTable:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
@@ -306,6 +371,36 @@ MonoBehaviour:
   boldSpacing: 7
   italicStyle: 35
   tabSize: 10
+<<<<<<< HEAD
+=======
+  m_fontInfo:
+    Name: Liberation Sans
+    PointSize: 86
+    Scale: 1
+    CharacterCount: 250
+    LineHeight: 98.90625
+    Baseline: 0
+    Ascender: 77.84375
+    CapHeight: 59.1875
+    Descender: -18.21875
+    CenterLine: 0
+    SuperscriptOffset: 77.84375
+    SubscriptOffset: -12.261719
+    SubSize: 0.5
+    Underline: -12.261719
+    UnderlineThickness: 6.298828
+    strikethrough: 23.675
+    strikethroughThickness: 0
+    TabWidth: 239.0625
+    Padding: 9
+    AtlasWidth: 1024
+    AtlasHeight: 1024
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
+>>>>>>> origin/main
 --- !u!28 &28268798066460806
 Texture2D:
   m_ObjectHideFlags: 0
@@ -316,6 +411,7 @@ Texture2D:
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
+<<<<<<< HEAD
   m_ForcedFallbackFormat: 4
   m_DownscaleFallback: 0
   serializedVersion: 2
@@ -327,6 +423,23 @@ Texture2D:
   m_IsReadable: 1
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
+=======
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 4
+  m_Width: 1
+  m_Height: 1
+  m_CompleteImageSize: 1
+  m_MipsStripped: 0
+  m_TextureFormat: 1
+  m_MipCount: 1
+  m_IsReadable: 1
+  m_IsPreProcessed: 0
+  m_IgnoreMipmapLimit: 0
+  m_MipmapLimitGroupName: 
+  m_StreamingMipmaps: 0
+  m_StreamingMipmapsPriority: 0
+  m_VTOnly: 0
+>>>>>>> origin/main
   m_AlphaIsTransparency: 0
   m_ImageCount: 1
   m_TextureDimension: 2
@@ -340,9 +453,17 @@ Texture2D:
     m_WrapW: 0
   m_LightmapFormat: 0
   m_ColorSpace: 0
+<<<<<<< HEAD
   image data: 0
   _typelessdata: 
   m_StreamData:
+=======
+  m_PlatformBlob: 
+  image data: 1
+  _typelessdata: 00
+  m_StreamData:
+    serializedVersion: 2
+>>>>>>> origin/main
     offset: 0
     size: 0
     path: 

Assets/TextMesh Pro/Resources/Sprite Assets.meta

@@ -1,9 +1,22 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+guid: 09b550510ac4d8646b2dfa81b0bfb581
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+=======
+>>>>>>> origin/main
 guid: 512a49d95c0c4332bdd98131869c23c9
 folderAsset: yes
 timeCreated: 1441876896
 licenseType: Pro
 DefaultImporter:
+<<<<<<< HEAD
+=======
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/TextMesh Pro/Resources/Style Sheets.meta

@@ -1,9 +1,22 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+guid: 8804c70a74c3d9141be28f4881fc1ce2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+=======
+>>>>>>> origin/main
 guid: 4aecb92fff08436c8303b10eab8da368
 folderAsset: yes
 timeCreated: 1441876950
 licenseType: Pro
 DefaultImporter:
+<<<<<<< HEAD
+=======
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
+>>>>>>> origin/main
   userData: 
   assetBundleName: 
   assetBundleVariant: