jxtsai
Translation completed |
Translation completed
5 years ago
|
jxtsai
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.6.2.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.6.2.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.1.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.1.iso.sig Auto-merging wiki/src/support/known_issues.pt.po Auto-merging wiki/src/support/known_issues.it.po Auto-merging wiki/src/support/known_issues.fa.po Auto-merging wiki/src/support/known_issues.es.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.es.po Auto-merging wiki/src/support/known_issues.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.6.fr.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.5.fr.po Auto-merging wiki/src/press.it.po Auto-merging wiki/src/press.es.po Auto-merging wiki/src/partners.es.po Auto-merging wiki/src/news/version_3.6.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fr.po Auto-merging wiki/src/news/version_3.6.1.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fr.po Auto-merging wiki/src/news/version_3.6.1.es.po Auto-merging wiki/src/donate.pt.po Auto-merging wiki/src/doc/about/warning.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |