From 44d1958d5f66a582d0fa6e7f7495ab2fe97a0f6b Mon Sep 17 00:00:00 2001
From: Aolin <aolin.zhang@pingcap.com>
Date: Wed, 25 Dec 2024 11:48:55 +0800
Subject: [PATCH] Apply suggestions from code review

---
 .github/pull_request_template.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 26ad24891..49eaa4921 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,11 +15,6 @@
 - [ ] master (the latest development version)
 - [ ] v1.4 (TiDB Operator 1.4 versions)
 - [ ] v1.3 (TiDB Operator 1.3 versions)
-<<<<<<< HEAD
-- [ ] v1.2 (TiDB Operator 1.2 versions)
-- [ ] v1.1 (TiDB Operator 1.1 versions)
-=======
->>>>>>> 6da2b818 (archive v1.2 (#2665))
 
 ### What is the related PR or file link(s)?