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 829af0cab7ceca8037ad66e02ace55e1567aaad2..8a6b4b88ef1c7f440304eaafdb03978c7678b661 100644 (file)
--- 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>