Skip to content

Commit 6285918

Browse files
authored
fix merge issue (#4947)
fix merge issue
1 parent 86dbdcd commit 6285918

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

conductor/tracks.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Tracks Registry
2-
<<<<<<< 176990-guards-for-pr
3-
=======
42

53
---
64

@@ -12,4 +10,3 @@
1210
- [~] **Track: Build a Merge Queue Dashboard**
1311
*Link: [./tracks/merge_queue_dashboard_20260205/](./tracks/merge_queue_dashboard_20260205/)*
1412

15-
>>>>>>> main

0 commit comments

Comments
 (0)