L

Assets/Sprites/meat_sauce_and_rice.png.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: a067d878271915c40a99e3caaa24fab5
-=======
-guid: 6658aaa835fd0354c8369158b264a7d7
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -43,11 +39,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-<<<<<<< HEAD
-    wrapW: 1
-=======
     wrapW: 0
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -71,26 +63,16 @@ TextureImporter:
   compressionQualitySet: 0
   textureFormatSet: 0
   ignorePngGamma: 0
-<<<<<<< HEAD
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-=======
   applyGammaDecoding: 1
   swizzle: 50462976
   cookieLightType: 2
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-<<<<<<< HEAD
-    textureCompression: 1
-=======
     textureCompression: 0
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -103,11 +85,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-<<<<<<< HEAD
-    textureCompression: 1
-=======
     textureCompression: 0
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -120,11 +98,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-<<<<<<< HEAD
-    textureCompression: 1
-=======
     textureCompression: 0
->>>>>>> fa28ffeb51c24a5110062cdfeb77b207a92fd94d
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0