From 2b59493f6c8ecb5e572294f4ec014265e8702139 Mon Sep 17 00:00:00 2001
From: Dzmitry Zubialevich <dzmitry.zubialevich@gmail.com>
Date: Mon, 25 Sep 2023 08:18:05 +0200
Subject: [PATCH] Update passing-props-to-a-component.md

---
 src/content/learn/passing-props-to-a-component.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/content/learn/passing-props-to-a-component.md b/src/content/learn/passing-props-to-a-component.md
index 5183bb16..6466f622 100644
--- a/src/content/learn/passing-props-to-a-component.md
+++ b/src/content/learn/passing-props-to-a-component.md
@@ -461,13 +461,8 @@ export default function Gallery() {
             (Нобелеўская прэмія па фізіцы, Нобелеўская прэмія па хіміі, медаль Дэві, медаль Матэуччы)
           </li>
           <li>
-<<<<<<< HEAD
             <b>Адкрыццё: </b>
-            Палоній (элемент)
-=======
-            <b>Discovered: </b>
-            polonium (chemical element)
->>>>>>> 2390627c9cb305216e6bd56e67c6603a89e76e7f
+            Палоній (хімічны элемент)
           </li>
         </ul>
       </section>