From 0ceb9c3f228262a27c734276dc296455f92997e1 Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Wed, 18 Jul 2018 11:36:24 +0100
Subject: [PATCH] Remove merge junk from constants.properties.

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

diff --git a/constants.properties b/constants.properties
index 2bb445e881..9e3bdc0ec6 100644
--- a/constants.properties
+++ b/constants.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # R3 Proprietary and Confidential
 #