Fixed merge conflict

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

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 731f1baa9d144a9897cb1d341c2092b8
+guid: 2df41ff9c3c31394691b43b8ff392de6
 folderAsset: yes
-timeCreated: 1442040525
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/TextMesh Pro/Resources/Sprite Assets.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 512a49d95c0c4332bdd98131869c23c9
+guid: 1658caa1d007c2748b4dfee2755c3495
 folderAsset: yes
-timeCreated: 1441876896
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/TextMesh Pro/Resources/Style Sheets.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 4aecb92fff08436c8303b10eab8da368
+guid: 192d62febb552ff4f9685368fd1aebf9
 folderAsset: yes
-timeCreated: 1441876950
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/TextMesh Pro/Resources/TMP Settings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   assetVersion: 2
   m_TextWrappingMode: 1
   m_enableKerning: 1
-  m_ActiveFontFeatures: 00000000
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   m_enableTintAllSprites: 0
   m_enableParseEscapeCharacters: 1
@@ -36,17 +36,14 @@ MonoBehaviour:
   m_fallbackFontAssets: []
   m_matchMaterialPreset: 1
   m_HideSubTextObjects: 0
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
-    type: 2}
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
   m_defaultSpriteAssetPath: Sprite Assets/
   m_enableEmojiSupport: 1
   m_MissingCharacterSpriteUnicode: 0
   m_EmojiFallbackTextAssets: []
   m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
-    type: 2}
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
   m_StyleSheetsResourcePath: 
   m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
-    type: 3}
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
   m_UseModernHangulLineBreakingRules: 0