mirror of
https://github.com/corda/corda.git
synced 2025-04-16 07:27:17 +00:00
Remove merge junk from constants.properties.
This commit is contained in:
parent
fbac6d7042
commit
0ceb9c3f22
@ -1,4 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
#
|
||||
# R3 Proprietary and Confidential
|
||||
#
|
||||
|
Loading…
x
Reference in New Issue
Block a user