Unresolved Conflicts in Source (umainform.lfm)

[pa-0]

FYI it looks like a merge was started but never finished. The code for umainform.lfm shows conflicts that were never properly resolved. I realize this is an inactive repository, but just thought you'd want to know:

object SnippetsMainFrm: TSnippetsMainFrm
<<<<<<< HEAD
  Left = 315
  Height = 581
  Top = 56
=======
  Left = 352
  Height = 581
  Top = 100
>>>>>>> 747aae165a283c89228d908bb5cbe9c7cd942bda
  Width = 987
  HorzScrollBar.Page = 824
  VertScrollBar.Page = 160
  AutoScroll = True
  Caption = 'Code Librarian'
  ClientHeight = 561
  ClientWidth = 987
  Menu = mnuMain
  OnClose = FormClose
<<<<<<< HEAD
  LCLVersion = '1.4.4.0'
=======
  LCLVersion = '1.4.0.4'
>>>>>>> 747aae165a283c89228d908bb5cbe9c7cd942bda
  object ToolBar1: TToolBar
    Left = 0
    Height = 40
    Top = 0
    Width = 987
    AutoSize = True
    ButtonHeight = 36
    ButtonWidth = 22
    Caption = 'tlbMain'
    EdgeBorders = [ebTop, ebBottom]
    Images = imlMain
    ParentShowHint = False
    ShowCaptions = True
    ShowHint = True
    TabOrder = 0
    object btnFileOpen: TToolButton
      Left = 1
      Top = 2
      Action = actFileOpen
      AutoSize = True