Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source
This commit is contained in:
Phillip Webb
2025-04-11 10:19:25 -07:00
parent 75824bb9c7 a506d2bdb5
commit a8c9abd5f9
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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.