1 files changed, 0 insertions, 7 deletions

diff --git a/arabluatex.lua b/arabluatex.lua
index 34f59e9..ab92174 100644
--- a/arabluatex.lua
+++ b/arabluatex.lua
@@ -832,18 +832,11 @@ 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)