Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/core/lombok/eclipse/handlers/HandleBuilder.java
#	src/core/lombok/eclipse/handlers/HandleConstructor.java
#	src/core/lombok/javac/handlers/HandleBuilder.java
#	src/core/lombok/javac/handlers/HandleConstructor.java

1 files changed, 8 insertions, 8 deletions

diff --git a/test/transform/resource/after-ecj/GetterOnClass.java b/test/transform/resource/after-ecj/GetterOnClass.java
index 8a822bcd..deb56392 100644
--- a/test/transform/resource/after-ecj/GetterOnClass.java
+++ b/test/transform/resource/after-ecj/GetterOnClass.java
@@ -4,7 +4,7 @@
   GetterOnClass1() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -15,10 +15,10 @@
   GetterOnClass2() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
     return this.isPackage;
   }
-  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isProtected() {
+  protected @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isProtected() {
     return this.isProtected;
   }
 }
@@ -28,7 +28,7 @@
   GetterOnClass3() {
     super();
   }
-  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPackage() {
+  @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPackage() {
     return this.isPackage;
   }
 }
@@ -38,7 +38,7 @@
   GetterOnClass4() {
     super();
   }
-  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPrivate() {
+  private @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPrivate() {
     return this.isPrivate;
   }
 }
@@ -48,7 +48,7 @@
   GetterOnClass5() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated boolean isPublic() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") boolean isPublic() {
     return this.isPublic;
   }
 }
@@ -58,10 +58,10 @@
   GetterOnClass6() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getCouldBeNull() {
+  public @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getCouldBeNull() {
     return this.couldBeNull;
   }
-  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") @lombok.Generated String getNonNull() {
+  public @lombok.NonNull @java.lang.SuppressWarnings("all") @javax.annotation.Generated("lombok") String getNonNull() {
     return this.nonNull;
   }
 }