From 090130ad37307147805ca96c4a0afbeb061a1646 Mon Sep 17 00:00:00 2001
From: Amanda Brown <amanda.brown@testdouble.com>
Date: Thu, 25 May 2023 11:37:52 -0400
Subject: [PATCH] Update lib/octicons_react/README.md

Co-authored-by: Josh Black <joshblack@github.com>
---
 lib/octicons_react/README.md | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/octicons_react/README.md b/lib/octicons_react/README.md
index 2662fbab3..9ed7b548b 100644
--- 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} />