conflict resolve

Signed-off-by: Jonny Galloway <[email protected]>

Project/project.json

@@ -2,10 +2,9 @@
     "project_name": "MPS-Asset-Test",
     "project_id": "{C8D8E20A-03DD-4507-A8C2-D3949C2A3977}",
     "license": "For terms please see the LICENSE*.TXT file at the root of this distribution.",
-    "origin": "https://o3d.foundation/",
     "origin_url": "https://github.com/o3de/o3de-multiplayersample-assets/",
     "display_name": "MPS: Asset Test Project",
-	"summary": "This project is set up for contributors to test assets created in this repos asset gems.",
+    "summary": "This project is set up for contributors to test assets created in this repos asset gems.",
 	"documentation_url": "https://github.com/o3de/o3de-multiplayersample-assets/Project/readme.md",
     "canonical_tags": [
         "Project"
@@ -23,7 +22,7 @@
         "../Gems/particlefx_mps",
         "../Gems/pbr_material_pack_mps",
         "../Gems/props_mps",
-		"Gem"
+        "Gem"
     ],
     "restricted": "MPS-Asset-Test",
     "gem_names": [