conflict resolution error

MjnMixael · MjnMixael · commit d41c5cd3aeb3 · 2025-10-27T14:48:25.000-05:00
diff --git a/code/missioneditor/missionsave.cpp b/code/missioneditor/missionsave.cpp
@@ -3548,7 +3548,7 @@ int Fred_mission_save::save_objects()
 				fout("\n$Arrival Anchor:");
 			}
 
-			int z = shipp->arrival_anchor;
+			z = shipp->arrival_anchor;
 			if (z < 0) {
 				fout(" <error>");
 			} else if (z & SPECIAL_ARRIVAL_ANCHOR_FLAG) {

Original file line number	Diff line number	Diff line change
`@@ -3548,7 +3548,7 @@ int Fred_mission_save::save_objects()`
`3548`	`3548`	`fout("\n$Arrival Anchor:");`
`3549`	`3549`	`}`
`3550`	`3550`
`3551`		`- int z = shipp->arrival_anchor;`
	`3551`	`+ z = shipp->arrival_anchor;`
`3552`	`3552`	`if (z < 0) {`
`3553`	`3553`	`fout(" <error>");`
`3554`	`3554`	`} else if (z & SPECIAL_ARRIVAL_ANCHOR_FLAG) {`