From 0dfb04779bbe641d7a272d7bd132b01ce88b9bef Mon Sep 17 00:00:00 2001
From: Aguirre Matteo <aguirre-matteo@proton.me>
Date: Wed, 24 Dec 2025 11:02:15 -0300
Subject: [PATCH] layout: fix conflict in arabic layout

---
 layouts/ara | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/layouts/ara b/layouts/ara
index cbb72ae..58f4419 100644
--- a/layouts/ara
+++ b/layouts/ara
@@ -113,11 +113,7 @@ z = ~
 7 = ٧
 8 = ٨
 9 = ٩
-<<<<<<< HEAD
-0 = ̥
-=======
 0 = ٠
->>>>>>> 8679f77 (Add eastern arabic 0)
 ; = گ
 = = ≠
 [ = چ