From: Jitendra Sahu Date: Wed, 10 Jun 2026 14:53:33 +0000 (+0530) Subject: Builder-Reimage: Fix merge conflict in README.md X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2602%2Fhead;p=ceph-build.git Builder-Reimage: Fix merge conflict in README.md Removed merge conflict markers from README. --- diff --git a/builder-reimage/README.md b/builder-reimage/README.md index 31e1a780b..9c94fdb41 100644 --- a/builder-reimage/README.md +++ b/builder-reimage/README.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Builder Reimage Pipeline ## Overview @@ -301,4 +300,3 @@ GitHub: jitendrasahu1803 ## License This project is licensed under the MIT License. ->>>>>>> 5c056f6f (Add builder reimage Jenkins pipelines and configs)