From 29d54cbaa144c6f62c3b29800335482d3ebfc4e2 Mon Sep 17 00:00:00 2001
From: Nafis Tiham <nafistiham@gmail.com>
Date: Sat, 26 Oct 2024 12:54:08 +0600
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 1f72894f6..3ea1d496d 100644
--- a/src/content/community/conferences.md
+++ b/src/content/community/conferences.md
@@ -10,7 +10,6 @@ Do you know of a local React.js conference? Add it here! (Please keep the list c
 
 ## Upcoming Conferences {/*upcoming-conferences*/}
 
-<<<<<<< HEAD
 ### React Paris 2024 {/*react-paris-2024*/}
 March 22, 2024. In-person in Paris, France + Remote (hybrid)
 
@@ -71,8 +70,6 @@ July 25, 2024. In-person in Berlin, Germany + remote (hybrid event)
 
 [Website](https://thegeekconf.com) - [Twitter](https://twitter.com/thegeekconf)
 
-=======
->>>>>>> 9467bc58868e66c53ca9385c8531dcf7b02178c2
 ### React Universe Conf 2024 {/*react-universe-conf-2024*/}
 September 5-6, 2024. Wrocław, Poland.