]> source.dussan.org Git - sonarqube.git/commit
Fix core.properties by removing merging conflicts
authorJulien HENRY <julien.henry@sonarsource.com>
Thu, 13 Oct 2016 15:11:27 +0000 (17:11 +0200)
committerJulien HENRY <henryju@yahoo.fr>
Fri, 14 Oct 2016 08:48:14 +0000 (10:48 +0200)
commit50c03de3431007269b0966a8fdf1fe032c9521f6
treea12cf18b1eed9ee6211bf294923da53c09ef92c0
parent2e2d8c71b0f3f8169d22c17bc4e23c13c6046c6d
Fix core.properties by removing merging conflicts
sonar-core/src/main/resources/org/sonar/l10n/core.properties