moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-01-07 19:58:00 -05:00
Code Issues Releases Wiki Activity

Fix a merge gone wrong.

Browse Source
This commit is contained in:
Merlijn Wajer 2011-10-11 17:15:04 +02:00
parent 5440b8d802
commit 497f84e75b
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Projects/Simba/simbaunit.lfm
View File

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