conflict resolution error

MjnMixael · MjnMixael · commit 647809fab561 · 2025-09-21T16:54:47.000-05:00
diff --git a/code/missioneditor/missionsave.cpp b/code/missioneditor/missionsave.cpp
@@ -3544,7 +3544,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
`@@ -3544,7 +3544,7 @@ int Fred_mission_save::save_objects()`
`3544`	`3544`	`fout("\n$Arrival Anchor:");`
`3545`	`3545`	`}`
`3546`	`3546`
`3547`		`- int z = shipp->arrival_anchor;`
	`3547`	`+ z = shipp->arrival_anchor;`
`3548`	`3548`	`if (z < 0) {`
`3549`	`3549`	`fout(" <error>");`
`3550`	`3550`	`} else if (z & SPECIAL_ARRIVAL_ANCHOR_FLAG) {`