Update lib/octicons_react/README.md

Co-authored-by: Josh Black <joshblack@github.com>
primer · May 25, 2023 · 090130a · 090130a
1 parent ee5b92c
commit 090130a
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/lib/octicons_react/README.md b/lib/octicons_react/README.md
@@ -158,13 +158,6 @@ export default () => (
 )
 ```
 
-<<<<<<< HEAD
-
-> ⚠️ The `Octicon` component is deprecated. Use icon components on their own instead:
-
-=======
-
-> > > > > > > origin/main
 
 ```diff
 - <Octicon icon={AlertIcon} />