Merge

IronToad_UnityProject/Assets/Sound.meta

@@ -1,6 +1,8 @@
 fileFormatVersion: 2
-guid: 73fb9ee280b0c75439600b4d5c3a6a7d
+guid: 844c4f25011b45348a5db5bc5b4f956e
 folderAsset: yes
+timeCreated: 1485037848
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

IronToad_UnityProject/Assets/Sound/Music.meta → IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 1715d56e0d2b68246a82993db31014ab
+guid: 844c4f25011b45348a5db5bc5b4f956e
 folderAsset: yes
-timeCreated: 1485006712
-licenseType: Free
+timeCreated: 1485037848
+licenseType: Pro
 DefaultImporter:
   userData: 
   assetBundleName: 

IronToad_UnityProject/Assets/Sound/SFX.meta → IronToad_UnityProject/Assets/Sound.meta~HEAD

@@ -1,8 +1,6 @@
 fileFormatVersion: 2
-guid: de5a3adcedb96f64183518ac89622ade
+guid: 73fb9ee280b0c75439600b4d5c3a6a7d
 folderAsset: yes
-timeCreated: 1485006712
-licenseType: Free
 DefaultImporter:
   userData: 
   assetBundleName: 

IronToad_UnityProject/Assets/Textures.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 2a6e699820a38a544acfc0015eb679a2
-folderAsset: yes
-timeCreated: 1484972317
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 338533d5d159c00478a9fb5321b7d922
-folderAsset: yes
-timeCreated: 1485007190
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: