From 497f84e75bf774c3e9af85bdb47a39f373bf7370 Mon Sep 17 00:00:00 2001
From: Merlijn Wajer <merlijn@wizzup.org>
Date: Tue, 11 Oct 2011 17:15:04 +0200
Subject: [PATCH] Fix a merge gone wrong.

---
 Projects/Simba/simbaunit.lfm | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/Projects/Simba/simbaunit.lfm b/Projects/Simba/simbaunit.lfm
index ddd772c..6d5e3cf 100644
--- a/Projects/Simba/simbaunit.lfm
+++ b/Projects/Simba/simbaunit.lfm
@@ -397,17 +397,10 @@ object SimbaForm: TSimbaForm
         EditLabel.AnchorSideTop.Side = asrCenter
         EditLabel.AnchorSideRight.Control = LabeledEditSearch
         EditLabel.AnchorSideBottom.Control = LabeledEditSearch
-<<<<<<< HEAD
         EditLabel.Left = 64
         EditLabel.Height = 18
         EditLabel.Top = 10
         EditLabel.Width = 37
-=======
-        EditLabel.Left = 71
-        EditLabel.Height = 16
-        EditLabel.Top = 9
-        EditLabel.Width = 30
->>>>>>> upstream/master
         EditLabel.Caption = 'Find: '
         EditLabel.ParentColor = False
         LabelPosition = lpLeft
@@ -422,11 +415,7 @@ object SimbaForm: TSimbaForm
         Left = 320
         Height = 24
         Top = 7
-<<<<<<< HEAD
         Width = 101
-=======
-        Width = 80
->>>>>>> upstream/master
         Caption = 'Match case'
         OnClick = CheckBoxMatchCaseClick
         TabOrder = 1
@@ -468,13 +457,10 @@ object SimbaForm: TSimbaForm
         OnKeyDown = editSearchListKeyDown
         OnKeyPress = editSearchListKeyPress
       end
-<<<<<<< HEAD
-=======
       inherited FunctionListLabel: TLabel
         Height = 16
         Width = 146
       end
->>>>>>> upstream/master
     end
   end
   object MainMenu: TMainMenu