Merge branch 'master' into wither

Conflicts:
	src/core/lombok/javac/handlers/JavacHandlerUtil.java

1 files changed, 7 insertions, 7 deletions

diff --git a/test/transform/resource/after-ecj/DelegateRecursion.java b/test/transform/resource/after-ecj/DelegateRecursion.java
index 3d9db9ef..7d1705a7 100644
--- a/test/transform/resource/after-ecj/DelegateRecursion.java
+++ b/test/transform/resource/after-ecj/DelegateRecursion.java
@@ -1,21 +1,21 @@
 import lombok.Delegate;
 class DelegateRecursionOuterMost {
   private final @Delegate DelegateRecursionCenter center = new DelegateRecursionCenter();
-  public @java.lang.SuppressWarnings("all") void innerMostMethod() {
-    this.center.innerMostMethod();
-  }
   DelegateRecursionOuterMost() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void innerMostMethod() {
+    this.center.innerMostMethod();
+  }
 }
 class DelegateRecursionCenter {
   private final @Delegate DelegateRecursionInnerMost inner = new DelegateRecursionInnerMost();
-  public @java.lang.SuppressWarnings("all") void innerMostMethod() {
-    this.inner.innerMostMethod();
-  }
   DelegateRecursionCenter() {
     super();
   }
+  public @java.lang.SuppressWarnings("all") void innerMostMethod() {
+    this.inner.innerMostMethod();
+  }
 }
 class DelegateRecursionInnerMost {
   DelegateRecursionInnerMost() {
@@ -23,4 +23,4 @@ class DelegateRecursionInnerMost {
   }
   public void innerMostMethod() {
   }
-}
\ No newline at end of file
+}