Merge branch 'master' into wither

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

1 files changed, 6 insertions, 6 deletions

diff --git a/test/transform/resource/after-ecj/GetterEnum.java b/test/transform/resource/after-ecj/GetterEnum.java
index 3536a6e8..fd70ce9e 100644
--- a/test/transform/resource/after-ecj/GetterEnum.java
+++ b/test/transform/resource/after-ecj/GetterEnum.java
@@ -7,15 +7,15 @@ import lombok.RequiredArgsConstructor;
   private final @Getter String name;
   <clinit>() {
   }
-  private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) {
-    super();
-    this.id = id;
-    this.name = name;
-  }
   public @java.lang.SuppressWarnings("all") int getId() {
     return this.id;
   }
   public @java.lang.SuppressWarnings("all") String getName() {
     return this.name;
   }
-}
\ No newline at end of file
+  private @java.lang.SuppressWarnings("all") GetterEnum(final int id, final String name) {
+    super();
+    this.id = id;
+    this.name = name;
+  }
+}