Fix meta data warnings

Assets/CardBaseEntity.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 0bb04d6ac99220141918b14c218e9b07
-=======
-guid: e993b749780a99048849c6d4786d68d4
->>>>>>> c84de76e09c9f8431d54e166c567e26909d5a3d8
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/CardEffect/EX9/Blue.meta

@@ -1,14 +1,8 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/CardEffect/EX9/Blue.meta
 guid: 7f2f806a957523a4aa60b74130baa6ca
 folderAsset: yes
 DefaultImporter:
-========
-guid: 1676093a2c0c82742a6f093b812def00
-NativeFormatImporter:
->>>>>>>> EX9:Assets/CardBaseEntity/BT16/Blue/Digimon/BT16_028_P5.asset.meta
   externalObjects: {}
-  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: