Fix .uproject file

aurebidart · aurebidart · commit e8adb0f13f51 · 2025-07-21T11:09:16.000-03:00
diff --git a/unreal/Blocks/Blocks.uproject b/unreal/Blocks/Blocks.uproject
@@ -35,13 +35,6 @@
 		{
 			"Name": "SunPosition",
 			"Enabled": true
-<<<<<<< HEAD
-=======
-		},
-		{
-			"Name": "Niagara",
-			"Enabled": true
->>>>>>> 4fb8ebd (squash all jsbsim_integration branch)
 		}
 	],
 	"TargetPlatforms": [

Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,6 @@`
`35`	`35`	`{`
`36`	`36`	`"Name": "SunPosition",`
`37`	`37`	`"Enabled": true`
`38`		`-<<<<<<< HEAD`
`39`		`-=======`
`40`		`- },`
`41`		`- {`
`42`		`- "Name": "Niagara",`
`43`		`- "Enabled": true`
`44`		`->>>>>>> 4fb8ebd (squash all jsbsim_integration branch)`
`45`	`38`	`}`
`46`	`39`	`],`
`47`	`40`	`"TargetPlatforms": [`