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, 4 deletions

diff --git a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
index f285d75d..0d0d6525 100644
--- a/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
+++ b/test/transform/resource/after-delombok/WitherAndAllArgsConstructor.java
@@ -7,7 +7,6 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 	@java.beans.ConstructorProperties({"test", "test2", "y", "z"})
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public WitherAndAllArgsConstructor(final J test, final java.util.List<L> test2, final int y, final int z) {
 		this.test = test;
 		this.test2 = test2;
@@ -16,14 +15,12 @@ class WitherAndAllArgsConstructor<T, J extends T, L extends java.lang.Number> {
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public WitherAndAllArgsConstructor<T, J, L> withTest(final J test) {
 		return this.test == test ? this : new WitherAndAllArgsConstructor<T, J, L>(test, this.test2, this.y, this.z);
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public WitherAndAllArgsConstructor<T, J, L> withTest2(final java.util.List<L> test2) {
 		return this.test2 == test2 ? this : new WitherAndAllArgsConstructor<T, J, L>(this.test, test2, this.y, this.z);
 	}
-}
\ No newline at end of file
+}