41279 Remove useless conflict text

mui · May 3, 2024 · 95f4c17 · 95f4c17
1 parent 32a1ceb
commit 95f4c17
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/...rial/migration/migrating-from-deprecated-apis/migrating-from-deprecated-apis.md b/...rial/migration/migrating-from-deprecated-apis/migrating-from-deprecated-apis.md
@@ -943,8 +943,6 @@ Here's how to migrate:
  },
 ```
 
-<<<<<<< HEAD
-
 ### components
 
 The PaginationItems's `components` was deprecated in favor of `slots`: