From 39bb3912a555b657a5da048dccf13f6d7fb77e43 Mon Sep 17 00:00:00 2001
From: Anthony Keenan <anthony.keenan@r3.com>
Date: Wed, 18 Apr 2018 11:37:38 +0100
Subject: [PATCH] Fix merge issue

---
 constants.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/constants.properties b/constants.properties
index 5f1ded836f..6f82ef914b 100644
--- a/constants.properties
+++ b/constants.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # R3 Proprietary and Confidential
 #