From baa913b1ac067119252931b8c31f94b00dc9b107 Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@symless.com>
Date: Fri, 3 May 2019 13:35:39 +0100
Subject: [PATCH] Create ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index b31c9fe12..828853c0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -475,6 +475,9 @@ Task #2905: Unit tests: Clipboard classes
 Task #3072: Downgrade Linux build machines
 Task #3090: CXWindowsKeyState integ test args wrong
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 >>>>>>> 2d76a4c5... Create ChangeLog
+=======
+>>>>>>> 2d76a4c5... Create ChangeLog