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/BuilderWithExistingBuilderClass.java b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
index e6b09e6f..03692529 100644
--- a/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
+++ b/test/transform/resource/after-delombok/BuilderWithExistingBuilderClass.java
@@ -5,52 +5,44 @@ class BuilderWithExistingBuilderClass<T, K extends Number> {
 	public static class BuilderWithExistingBuilderClassBuilder<Z extends Number> {
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private boolean arg2;
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private String arg3;
 		private Z arg1;
 		public void arg2(boolean arg) {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		BuilderWithExistingBuilderClassBuilder() {
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderWithExistingBuilderClassBuilder<Z> arg1(final Z arg1) {
 			this.arg1 = arg1;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderWithExistingBuilderClassBuilder<Z> arg3(final String arg3) {
 			this.arg3 = arg3;
 			return this;
 		}
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderWithExistingBuilderClass build() {
 			return BuilderWithExistingBuilderClass.<Z>staticMethod(arg1, arg2, arg3);
 		}
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public java.lang.String toString() {
 			return "BuilderWithExistingBuilderClass.BuilderWithExistingBuilderClassBuilder(arg1=" + this.arg1 + ", arg2=" + this.arg2 + ", arg3=" + this.arg3 + ")";
 		}
 	}
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public static <Z extends Number> BuilderWithExistingBuilderClassBuilder<Z> builder() {
 		return new BuilderWithExistingBuilderClassBuilder<Z>();
 	}
-}
\ No newline at end of file
+}