From 4c538638a4fb74785aec2d314b49b3ec9f25fb47 Mon Sep 17 00:00:00 2001
From: Ali Oguzhan Yildiz <aoguzhanyildiz@gmail.com>
Date: Thu, 23 Nov 2023 23:46:05 +0300
Subject: [PATCH] Update rendering-lists.md

---
 src/content/learn/rendering-lists.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/content/learn/rendering-lists.md b/src/content/learn/rendering-lists.md
index 46bfd6a9d..a474090e1 100644
--- a/src/content/learn/rendering-lists.md
+++ b/src/content/learn/rendering-lists.md
@@ -1147,11 +1147,7 @@ hr {
 
 <Hint>
 
-<<<<<<< HEAD
-Burada `map` metodu yerine manuel bir döngü kullanmanız ya da bir fragment kullanmanız gerekmektedir.
-=======
-You'll either need to convert `map` to a manual loop, or use a Fragment.
->>>>>>> 4f9e9a56611c7a56b9506cf0a7ca84ab409824bc
+Burada `map` metodu yerine manuel bir döngü kullanmanız ya da bir Fragment kullanmanız gerekmektedir.
 
 </Hint>