From d1192bb3f9eb932ccc0f40116de843de51af532c Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 29 Oct 2015 19:09:05 +0000 Subject: [PATCH] Fix incorrect merge-conflict resolution of previous commit. --- src/train_cmd.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 1bc16d7f59..7d17272cd4 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -3352,6 +3352,7 @@ static void HandleSignalBehindTrain(Train *v, uint signal_number) ClrBit(_m[v->tile].m2, signal_number); MarkTileDirtyByTile(tile); } +} uint16 ReversingDistanceTargetSpeed(const Train *v) {