Skip to content

Commit a506d2b

Browse files
committed
Fix merge commit error in header
1 parent 35dc8e6 commit a506d2b

File tree

1 file changed

+0
-4
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build

1 file changed

+0
-4
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
/*
2-
<<<<<<< HEAD
3-
* Copyright 2012-2024 the original author or authors.
4-
=======
52
* Copyright 2012-2025 the original author or authors.
6-
>>>>>>> 3.3.x
73
*
84
* Licensed under the Apache License, Version 2.0 (the "License");
95
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)