From 55dd155e567a21c8be3282c7a3ffff8f29bf69d8 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Fri, 3 May 2019 13:35:39 +0100
Subject: [PATCH] Merged master into v1-dev

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index db590ffb..b31c9fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -474,4 +474,7 @@ Feature #3119: Mac OS X secondary screen
 Task #2905: Unit tests: Clipboard classes
 Task #3072: Downgrade Linux build machines
 Task #3090: CXWindowsKeyState integ test args wrong
+<<<<<<< HEAD
 
+=======
+>>>>>>> 2d76a4c5... Create ChangeLog