CPP-744: remote mode: registry.properties - resolving merge conflict
authorVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Sat, 8 Sep 2018 09:38:44 +0000 (12:38 +0300)
committerVasily Romanikhin <vasily.romanikhin@jetbrains.com>
Sat, 8 Sep 2018 09:38:44 +0000 (12:38 +0300)
commitfbf66fcb050c44025f6cb97d6433c997269619f0
treea97f068a7e56f76fa9778b414df652f392e107d8
parenta6fa3783ee5f0aa4584bdf122e11910f614578bc
parent3b4eedaccd2098cef48de97ccfb0daf7f1d42af8
CPP-744: remote mode: registry.properties - resolving merge conflict
platform/util/resources/misc/registry.properties