Merge pull request #132 from o3de/FixPrefabMerge

Corrects a bad merge on the shield gen prefab

Gems/level_art_mps/Assets/MalfunctioningShieldGenerator/mshieldgen.prefab

@@ -244,18 +244,6 @@
                 "Component_[17189487875759770322]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "Id": 17189487875759770322
-    
-          
-            
-    
-          
-          
-            
-    
-          
-    
-    @@ -278,9 +303,12 @@
-  
                 },
                 "Component_[2849133690452512923]": {
                     "$type": "EditorPendingCompositionComponent",