From 954cf72de4e8091ee1b0392ba6d1492cbf0f33ce Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 8 Dec 2017 15:32:40 -0800 Subject: [PATCH] Fix javadoc --- .../boot/autoconfigure/web/ServerProperties.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index 1118965e8c..08d66f1ee3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -568,10 +568,8 @@ public class ServerProperties { private File basedir; /** - * <<<<<<< HEAD Delay between the invocation of backgroundProcess methods. If a - * duration suffix is not specified, seconds will be used. ======= Delay, in - * seconds, between the invocation of backgroundProcess methods. >>>>>>> Align - * edits with code + * Delay between the invocation of backgroundProcess methods. If a + * duration suffix is not specified, seconds will be used. */ @DefaultDurationUnit(ChronoUnit.SECONDS) private Duration backgroundProcessorDelay = Duration.ofSeconds(30); @@ -914,9 +912,7 @@ public class ServerProperties { public static class Resource { /** - * <<<<<<< HEAD Time-to-live of the static resource cache. ======= - * Time-to-live, in milliseconds, of the static resource cache. >>>>>>> Align - * edits with code + * Time-to-live of the static resource cache. */ private Duration cacheTtl;