ammend 205257e

reutenauer · Nov 7, 2024 · c870da5 · c870da5
1 parent 3c6e50e
commit c870da5
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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: