Remove merge junk from constants.properties.

This commit is contained in:
Chris Rankin 2018-07-18 11:36:24 +01:00
parent fbac6d7042
commit 0ceb9c3f22

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
#
# R3 Proprietary and Confidential
#