From 97d47c3039117faa4ccbca5591bca2f4279064d0 Mon Sep 17 00:00:00 2001
From: Duncan Frost <duncans_pumpkin@hotmail.co.uk>
Date: Fri, 10 Oct 2014 10:31:10 +0100
Subject: [PATCH] Fix merge fail

---
 src/peep/peep.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 2cf8979ed7..2248a1e4fe 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -27,6 +27,7 @@
 #include "../localisation/localisation.h"
 #include "../management/news_item.h"
 #include "../ride/ride.h"
+#include "../scenario.h"
 #include "../sprites.h"
 #include "../world/sprite.h"
 #include "peep.h"