From 27b6ec2724431b748d99430734897c09decc950d Mon Sep 17 00:00:00 2001
From: Ahmed Abdelbaset <A7med3bdulBaset@gmail.com>
Date: Mon, 23 Sep 2024 03:22:32 +0300
Subject: [PATCH] Update src/content/learn/conditional-rendering.md

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

diff --git a/src/content/learn/conditional-rendering.md b/src/content/learn/conditional-rendering.md
index 6c5a3b277..1df5635f4 100644
--- a/src/content/learn/conditional-rendering.md
+++ b/src/content/learn/conditional-rendering.md
@@ -206,11 +206,7 @@ return (
 );
 ```
 
-<<<<<<< HEAD
-يمكنك قرائتها على النحو التالي *”إذا كان `isPacked` صحيحا، إذا قم بعرض `name + ' ✔'`، وإلا (`:`) قم بعرض `name`“.*
-=======
-You can read it as *"if `isPacked` is true, then (`?`) render `name + ' ✅'`, otherwise (`:`) render `name`"*.
->>>>>>> c003ac4eb130fca70b88cf3a1b80ce5f76c51ae3
+يمكنك قرائتها على النحو التالي *”إذا كان `isPacked` صحيحا، إذا قم بعرض name + ' ✅'`، وإلا (`:`) قم بعرض `name`“.*
 
 <DeepDive>