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, 1 insertions, 9 deletions

diff --git a/test/transform/resource/after-delombok/GetterOnClass.java b/test/transform/resource/after-delombok/GetterOnClass.java
index a9d1280c..3a7c76a0 100644
--- a/test/transform/resource/after-delombok/GetterOnClass.java
+++ b/test/transform/resource/after-delombok/GetterOnClass.java
@@ -3,7 +3,6 @@ class GetterOnClass1 {
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -14,13 +13,11 @@ class GetterOnClass2 {
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	protected boolean isProtected() {
 		return this.isProtected;
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -30,7 +27,6 @@ class GetterOnClass3 {
 	boolean isPackage;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	boolean isPackage() {
 		return this.isPackage;
 	}
@@ -40,7 +36,6 @@ class GetterOnClass4 {
 	boolean isPrivate;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	private boolean isPrivate() {
 		return this.isPrivate;
 	}
@@ -50,7 +45,6 @@ class GetterOnClass5 {
 	boolean isPublic;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public boolean isPublic() {
 		return this.isPublic;
 	}
@@ -61,15 +55,13 @@ class GetterOnClass6 {
 	String nonNull;
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public String getCouldBeNull() {
 		return this.couldBeNull;
 	}
 	@lombok.NonNull
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public String getNonNull() {
 		return this.nonNull;
 	}
-}
\ No newline at end of file
+}