livecodeali

--- /Users/gheizhwinder/Documents/release-notes-1.5-beta-3.md	2019-12-20 15:20:25.000000000 +0000
+++ /Users/gheizhwinder/Documents/release-notes-1.5-beta-4.md	2020-01-23 13:30:45.000000000 +0000
@@ -4,20 +4,42 @@
 
 #### Tool
 
-* The ability to configure the fullscreen mode for iOS and Android has been
-added to the relevant settings dialog.
+* The android device recognition mechanism has been improved
 

livecodeali

--- /Users/gheizhwinder/Documents/sourcedocs-1.5-beta-3.md	2019-12-20 15:20:23.000000000 +0000
+++ /Users/gheizhwinder/Documents/sourcedocs-1.5-beta-4.md	2020-01-23 13:30:44.000000000 +0000
@@ -428,7 +428,7 @@
 
 Implemented with override. The value returned by Get(ApplicationVersion)
 will be that specified as the corresponding override at compile-time. If no
-override is set then "Go 17.0.0" is returned.
+override is set then "Go 18.0.0" is returned.
 
 

livecodeali

--- /Users/gheizhwinder/Documents/release-notes-1.5-beta-2.md	2019-12-20 15:28:47.000000000 +0000
+++ /Users/gheizhwinder/Documents/release-notes-1.5-beta-3.md	2019-12-20 15:20:25.000000000 +0000
@@ -4,9 +4,23 @@
 
 #### Tool
 
+* The ability to configure the fullscreen mode for iOS and Android has been
+added to the relevant settings dialog.
+
 * A completely revamped tool UI has been implemented.

livecodeali

diff --git a/Documentation/guides/The LiveCode IDE.md b/Documentation/guides/The LiveCode IDE.md
index 43ef1ca0..967ac975 100644
--- a/Documentation/guides/The LiveCode IDE.md	
+++ b/Documentation/guides/The LiveCode IDE.md	
@@ -880,14 +880,10 @@ Figure 12 – Find and Replace
 | Switch to find mode                            | Control-f                               | Command-f                               |
 | Find next                                      | Control-g                               | Command-g                               |
 | Find selected text                             | Control-Option-f                        | Command-Option-f                        |
-<<<<<<< HEAD
-| Format current handler                         | Tab                                     | Tab                                     |

livecodeali

diff --git a/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript b/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript
index b92d193..768ecc3 100644
--- a/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript	
+++ b/Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript	
@@ -2129,12 +2129,6 @@ on backspaceKey
    if tTo > tFrom then
       textEndGroup
    end if
-<<<<<<< HEAD
-

livecodeali

--- /Users/gheizhwinder/Desktop/before.txt	2017-01-26 13:35:32.000000000 +0000
+++ /Users/gheizhwinder/Desktop/after.txt	2017-01-26 10:04:58.000000000 +0000
@@ -453,7 +453,7 @@
    parseOptions tOptions
    if the result is not empty then
       write "Usage: <exe> -ui [-location <path>] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
-      exit runFaceless
+      quit 1
    end if 
    

livecodeali

--- /Users/gheizhwinder/Desktop/before.txt	2017-01-26 09:51:54.000000000 +0000
+++ /Users/gheizhwinder/Desktop/after.txt	2017-01-26 10:04:58.000000000 +0000
@@ -453,7 +453,7 @@
    parseOptions tOptions
    if the result is not empty then
       write "Usage: <exe> -ui [-location <path>] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
-      exit runFaceless
+      quit 1
    end if 
    

livecodeali

--- /Users/gheizhwinder/Desktop/before.txt	2017-01-26 09:51:54.000000000 +0000
+++ /Users/gheizhwinder/Desktop/after.txt	2017-01-26 09:51:15.000000000 +0000
@@ -453,7 +453,7 @@
    parseOptions tOptions
    if the result is not empty then
       write "Usage: <exe> -ui [-location <path>] [-allusers] [-desktopshortcut] [-startmenu]" & return to stderr
-      exit runFaceless
+      quit 1
    end if 
    

livecodeali

diff --git a/engine/src/regex.cpp b/engine/src/regex.cpp
index 956e915..82f0ae9 100644
--- a/engine/src/regex.cpp
+++ b/engine/src/regex.cpp
@@ -356,11 +356,7 @@ regexp *MCR_compile(MCStringRef exp, bool casesensitive)
 	// If the pattern isn't found with the given flags, then create a new one.
 	if (re == nil)
 	{
-<<<<<<< HEAD
-		/* UNCHECKED */ re = new (nothrow) regexp;

livecodeali

/* Copyright (C) 2003-2016 LiveCode Ltd.

This file is part of LiveCode.

LiveCode is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License v3 as published by the Free
Software Foundation.

LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or