Fix merge error

spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java

@@ -258,15 +258,6 @@ public abstract class AbstractConfigurableEmbeddedServletContainer implements
 		this.jspServletClassName = jspServletClassName;
 	}
 
-	@Override
-	public void setSsl(Ssl ssl) {
-		this.ssl = ssl;
-	}
-
-	public Ssl getSsl() {
-		return this.ssl;
-	}
-
 	/**
 	 * @return the JSP servlet class name
 	 */