From f7dd9859e489b57b663542326c69b8506a2c70ec Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Tue, 14 Jul 2015 10:16:16 +0200
Subject: [PATCH] Fix merge error in englush_uk.txt

---
 data/language/english_uk.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt
index f32156e242..2fdada2e4f 100644
--- a/data/language/english_uk.txt
+++ b/data/language/english_uk.txt
@@ -3791,7 +3791,6 @@ STR_5454    :Uncap FPS
 STR_5455    :Enable sandbox mode
 STR_5456    :Disable clearance checks
 STR_5457    :Disable support limits
-<<<<<<< HEAD
 STR_5458    :Rotate clockwise
 STR_5459    :Rotate anti-clockwise
 STR_5460    :Rotate view anti-clockwise
@@ -3801,5 +3800,3 @@ STR_5463    :Goal: Have fun!
 STR_5464    :General
 STR_5465    :Climate
 STR_5466    :Staff
-=======
->>>>>>> allow disable clearance checks for footpaths