montegoulding

diff --git a/Toolset/home.livecodescript b/Toolset/home.livecodescript
index 9a88644..ae25f30 100644
--- a/Toolset/home.livecodescript
+++ b/Toolset/home.livecodescript
@@ -1165,42 +1165,8 @@ command revInternal__InitialiseLibraries
    try 	 	
       insert script of stack "revInitialisationLibrary" into back 	 
    catch tError 	 	
-<<<<<<< HEAD
       revInternal__Log "Error", "Error loading initialisation library" & return & tError 	 	

montegoulding

constant kMultiLineModeNone = 0
constant kMultiLineModeLiteral = 1
constant kMultiLineModeFolded = 2

command YAMLToArray pYaml
   local tInDocument = true
   local tPath
   local tArray
   local tPathLists
   local tReferences

montegoulding

on ideInitialiseMessageBox
   dispatch "setAsBehavior" to stack revIDEPaletteResourcePath("/behaviors/revmessageboxbehavior.livecodescript") with the long id of me
   set the behavior of card "Single Line" of me to the long id of stack revIDEMessageBoxBehavior("single line card")
   set the behavior of field "message" of card "Single Line" of me to the long id of stack revIDEMessageBoxBehavior("single line message")
   set the behavior of card "Multiple Lines" of me to the long id of stack revIDEMessageBoxBehavior("multiple lines card")
   set the behavior of field "message" of card "Multiple Lines" of me to the long id of stack revIDEMessageBoxBehavior("multiple lines message")
   revIDESubscribe "ideMsgChanged"
end ideInitialiseMessageBox

montegoulding

on doresize
   // AL-2014-05-21: [[ Bug 12074 ]] Support RTL layout when resizing ask dialog
   local tRTL
   put the cRTL of this card into tRTL
   
   local twidth, iwidth
   put the width of this stack into twidth
   if item 1 of the loc of button "icon" is not "-100" then 
      local tIconEdge
      if tRTL then

montegoulding

on preOpenStack
   global gAnswerDebugInfo
   global gAPKLargeFonts, gREVSmallAppIcon, gREVAppIcon
   local tIcons, tMacOSX, tMargin, tNumber, tIconWord, tIconAllowance, tText
   local tButtonNames, tNoOfButtons, tTotalBtnWidth, tMnemonicString, tNo
   local tFieldScript, tFieldSubtract, t, tWidth, tNewWidth, oldwidth, tAddition
   local tStartEdge, tHeight
   
   // AL-2014-05-21: [[ Bug 12074 ]] Tidied up and rearranged to support 
   //  RTL layout, as determined by item 5 of the dialogData

montegoulding

script "RepoFixer"
on preOpenCard
   create button "Fix Repo"
   set the rect of it to 10,10,100,33
   create field "Username"
   set the rect of it to 10,40,100,61
   set the visible of me to true
end preOpenCard

on mouseUp