]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Builder-Reimage: Fix merge conflict in README.md 2602/head
authorJitendra Sahu <jitendra.sahu1803@gmail.com>
Wed, 10 Jun 2026 14:53:33 +0000 (20:23 +0530)
committerGitHub <noreply@github.com>
Wed, 10 Jun 2026 14:53:33 +0000 (20:23 +0530)
Removed merge conflict markers from README.

builder-reimage/README.md

index 31e1a780b324d204958330eab4f7d118353bf15f..9c94fdb41cf0e6426916862c1ea360191fa02505 100644 (file)
@@ -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)