Merge branch 'master' of git.robertalessi.net:git/arabluatex

1 files changed, 7 insertions, 0 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index ab92174..34f59e9 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -832,11 +832,18 @@ function al_closestream()
    end)
    if string.find(t, "\\begin%s?{document}.-\\arb%s?[%[%{]") or
       string.find(t, "\\begin%s?{document}.-\\[Uu]c%s?%b{}")
+<<<<<<< HEAD
    then
       tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{
       There are still 'arabtex' strings to be converted.
       Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" ..
             [[ and compile it one more time}}]])
+=======
+   then      
+      tex.print([[\unexpanded{\PackageWarningNoLine{arabluatex}{There are still 'arabtex' strings
+      to be converted. Please open ]] .. tex.jobname .. utffilesuffix .. ".tex" ..
+         [[ and compile it one more time}}]])
+>>>>>>> 71471d41f59ab197bd5004ab5f177e4d853da84e
    else end
    t = t.."\n\\end{document}"
    io.write(t)