This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-7063
in repository https://gitbox.apache.org/repos/asf/maven.git

commit b3e3ba66c8f60567493ebda84b60f1302533016a
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Mon Nov 30 10:54:43 2020 +0100

    Fix indentation
    
    # Conflicts:
    #   
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
---
 .../main/java/org/apache/maven/model/building/DefaultModelBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index bdf2d93..1e86fce 100644
--- 
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ 
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -723,7 +723,7 @@ public class DefaultModelBuilder
         ModelData cachedData = fromCache( request.getModelCache(), 
modelSource, ModelCacheTag.RAW );
         if ( cachedData != null )
         {
-          return cachedData.getModel();
+            return cachedData.getModel();
         }
 
         Model rawModel;

Reply via email to