From a506d2bdb51df3336c44dac53d3aaf57016855b8 Mon Sep 17 00:00:00 2001
From: Phillip Webb <phil.webb@broadcom.com>
Date: Fri, 11 Apr 2025 10:19:03 -0700
Subject: [PATCH] Fix merge commit error in header

---
 .../springframework/boot/buildpack/platform/build/Phase.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java
index 992541a914..d892a637a2 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java
+++ b/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.