Hi, Stuart Prescott <stu...@debian.org> wrote: > The repo currently contains committed git conflict markers which are not > valid .po syntax: > > #. type: Content of: <book><preface><section><section><screen> > #, no-wrap > msgid "" > "$ zcat \"/usr/share/doc/base-passwd/users-and-groups.txt.gz\" | > sensible-pager\n" > "$ sensible-browser \"/usr/share/doc/base-passwd/users-and-groups.html\"\n" > "$ sensible-browser \"https://www.debian.org\""; > msgstr "" > <<<<<<< HEAD > "$ zcat \"/usr/share/doc/base-passwd/users-and-groups.txt.gz\" | > sensible-pager\n" > ======= > "$ zcat \"/usr/share/doc/base-passwd/users-and-groups.txt.gz\" | sensible-" > "pager\n" > >>>>>>> weblate > "$ sensible-browser \"/usr/share/doc/base-passwd/users-and-groups.html\"\n" > "$ sensible-browser \"https://www.debian.org\""; > > > At present: > > $ grep -c -e '<<< HEAD' po/{es,ja}.po > po/es.po:6 > po/ja.po:13
I have fixed the po files es.po and ja.po now. And pt also failed to build, due to several problems. Also fixed. debian-reference now builds fine again here. Adding CI for salsa to be done... Holger -- Holger Wansing <hwans...@mailbox.org> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
