Merge branch '3.4.x'

Author: philwebb

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java

@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright 2012-2024 the original author or authors.
-=======
  * Copyright 2012-2025 the original author or authors.
->>>>>>> 3.3.x
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.