From c870da562114064b384e6491f59fd1fb3642cb1d Mon Sep 17 00:00:00 2001
From: Udi Fogiel <udifoglle@gmail.com>
Date: Thu, 7 Nov 2024 13:07:35 +0200
Subject: [PATCH] ammend 205257e

---
 tex/polyglossia.sty | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tex/polyglossia.sty b/tex/polyglossia.sty
index 2eae1eeb..5877d002 100644
--- a/tex/polyglossia.sty
+++ b/tex/polyglossia.sty
@@ -1043,7 +1043,6 @@
   \tl_gset:Nn \xpg_main_language_tl {#2}
   %% The following settings are for the default language and script
   % this tells bidi.sty or luabidi.sty that the document is RTL
-<<<<<<< HEAD
   \str_if_eq:eeT { \prop_item:Nn \l_xpg_langsetup_prop { #2 / direction } } { RL }
     {
       \__xpg_setRTLmain: