From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 27 Feb 2015 17:23:36 +0000 (+0100)
Subject: Test internal Git merge tool
X-Git-Tag: 5.1-RC1~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ea0dd1c85069c253e4dbdc1b7c6e203b5beb082;p=sonarqube.git

Test internal Git merge tool
---

diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
index 829af0cab7c..8a6b4b88ef1 100644
--- a/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/PluginClassloaders.java
@@ -46,7 +46,7 @@ import java.util.Map;
  * <h3>IMPORTANT</h3>
  * <p>
  * If we have pluginA , then all classes and resources from package and subpackages of <b>org.sonar.plugins.pluginA.api</b> will be visible
- * for all other plugins even if they located in dependent library.
+ * for all other plugins even if they are located in dependent library.
  * </p>
  * <p/>
  * <h4>Search order for {@link ClassRealm} :</h4>