ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-14 16:59:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Anthony Keenan 2018-04-18 11:37:38 +01:00
parent af77c5a287
commit 39bb3912a5
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.properties
View File

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