Ikumi Keita <ik...@ikumi.que.jp> writes: > Now bug#70811 is resolved. I think we can go now.
Thanks, I updated NEWS.org and pushed. Then I did: • $ git switch main • $ git merge origin/master and get the following: CONFLICT (modify/delete): Makefile.in deleted in HEAD and modified in origin/master. Version origin/master of Makefile.in left in tree. Automatic merge failed; fix conflicts and then commit the result. @Tassilo: Please help ;-) Best, Arash _______________________________________________ bug-auctex mailing list bug-auctex@gnu.org https://lists.gnu.org/mailman/listinfo/bug-auctex
