From 76bc02d96c08f6549d27061624d9ac6fb2c854e1 Mon Sep 17 00:00:00 2001
From: Khakim Aidarkhan <39030121+khakimio@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:32:38 +0500
Subject: [PATCH] Update conferences.md

---
 src/content/community/conferences.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/content/community/conferences.md b/src/content/community/conferences.md
index a621f256..a28d6084 100644
--- a/src/content/community/conferences.md
+++ b/src/content/community/conferences.md
@@ -15,13 +15,10 @@ March 22, 2024. In-person in Paris, France + Remote (hybrid)
 
 [Website](https://react.paris/) - [Twitter](https://twitter.com/BeJS_) - [LinkedIn](https://www.linkedin.com/events/7150816372074192900/comments/)
 
-<<<<<<< HEAD
-=======
 ### Epic Web Conf 2024 {/*epic-web-2024*/}
 April 10 - 11, 2024. In-person in Park City, UT, USA
 
 [Website](https://www.epicweb.dev/conf) - [YouTube](https://www.youtube.com/@EpicWebDev)
->>>>>>> 9e1f5cd590fd066e72dda9022237bee30b499951
 
 ### React Miami 2024 {/*react-miami-2024*/}
 April 19 - 20, 2024. In-person in Miami, FL, USA