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

diff --git a/test/transform/resource/after-delombok/BuilderWithTolerate.java b/test/transform/resource/after-delombok/BuilderWithTolerate.java
index decb05d3..5eff9120 100644
--- a/test/transform/resource/after-delombok/BuilderWithTolerate.java
+++ b/test/transform/resource/after-delombok/BuilderWithTolerate.java
@@ -12,7 +12,6 @@ public class BuilderWithTolerate {
 	public static class BuilderWithTolerateBuilder {
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		private int value;
 		
 		@Tolerate
@@ -22,13 +21,11 @@ public class BuilderWithTolerate {
 		
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		BuilderWithTolerateBuilder() {
 		}
 		
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderWithTolerateBuilder value(final int value) {
 			this.value = value;
 			return this;
@@ -36,7 +33,6 @@ public class BuilderWithTolerate {
 		
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public BuilderWithTolerate build() {
 			return new BuilderWithTolerate(value);
 		}
@@ -44,7 +40,6 @@ public class BuilderWithTolerate {
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		@javax.annotation.Generated("lombok")
-		@lombok.Generated
 		public java.lang.String toString() {
 			return "BuilderWithTolerate.BuilderWithTolerateBuilder(value=" + this.value + ")";
 		}
@@ -52,15 +47,13 @@ public class BuilderWithTolerate {
 	
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	BuilderWithTolerate(final int value) {
 		this.value = value;
 	}
 	
 	@java.lang.SuppressWarnings("all")
 	@javax.annotation.Generated("lombok")
-	@lombok.Generated
 	public static BuilderWithTolerateBuilder builder() {
 		return new BuilderWithTolerateBuilder();
 	}
-}
\ No newline at end of file
+}