cacu
Repository merge failed |
6 years ago
|
cacu
Repository merge failed |
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/security/Numerous_security_holes_in_3.5.es.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.5.es.po Auto-merging wiki/src/news/version_3.7.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.pt.po Auto-merging wiki/src/news/version_3.7.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.it.po Auto-merging wiki/src/news/version_3.7.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fr.po Auto-merging wiki/src/news/version_3.7.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fa.po Auto-merging wiki/src/news/version_3.7.es.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.es.po Auto-merging wiki/src/news/version_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po Auto-merging wiki/src/news/version_3.6.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po Auto-merging wiki/src/news/version_3.6.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.it.po Auto-merging wiki/src/news/version_3.6.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fa.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.it.po Auto-merging wiki/src/news/version_3.6.2.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fa.po Auto-merging wiki/src/news/version_3.6.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po Auto-merging wiki/src/news/version_3.6.1.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po Auto-merging wiki/src/news/version_3.6.1.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po Auto-merging wiki/src/install/win/usb-overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po Auto-merging wiki/src/install.it.po Auto-merging wiki/src/donate.es.po CONFLICT (content): Merge conflict in wiki/src/donate.es.po Auto-merging wiki/src/doc/about/requirements.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
cacu
Repository merge failed |
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/security/Numerous_security_holes_in_3.5.es.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.5.es.po Auto-merging wiki/src/news/version_3.7.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.pt.po Auto-merging wiki/src/news/version_3.7.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.it.po Auto-merging wiki/src/news/version_3.7.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fr.po Auto-merging wiki/src/news/version_3.7.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fa.po Auto-merging wiki/src/news/version_3.7.es.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.es.po Auto-merging wiki/src/news/version_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po Auto-merging wiki/src/news/version_3.6.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po Auto-merging wiki/src/news/version_3.6.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.it.po Auto-merging wiki/src/news/version_3.6.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fa.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.it.po Auto-merging wiki/src/news/version_3.6.2.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fa.po Auto-merging wiki/src/news/version_3.6.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po Auto-merging wiki/src/news/version_3.6.1.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po Auto-merging wiki/src/news/version_3.6.1.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po Auto-merging wiki/src/install/win/usb-overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po Auto-merging wiki/src/install.it.po Auto-merging wiki/src/donate.es.po CONFLICT (content): Merge conflict in wiki/src/donate.es.po Auto-merging wiki/src/doc/about/requirements.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
cacu
Suggestion added |
|
cacu
Suggestion added |
|
cacu
Suggestion added |
|
cacu
Repository merge failed |
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/security/Numerous_security_holes_in_3.5.es.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.5.es.po Auto-merging wiki/src/news/version_3.7.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.pt.po Auto-merging wiki/src/news/version_3.7.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.it.po Auto-merging wiki/src/news/version_3.7.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fr.po Auto-merging wiki/src/news/version_3.7.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.fa.po Auto-merging wiki/src/news/version_3.7.es.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.es.po Auto-merging wiki/src/news/version_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.de.po Auto-merging wiki/src/news/version_3.6.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po Auto-merging wiki/src/news/version_3.6.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.it.po Auto-merging wiki/src/news/version_3.6.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fa.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.it.po Auto-merging wiki/src/news/version_3.6.2.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fa.po Auto-merging wiki/src/news/version_3.6.1.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po Auto-merging wiki/src/news/version_3.6.1.it.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po Auto-merging wiki/src/news/version_3.6.1.fa.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po Auto-merging wiki/src/install/win/usb-overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.es.po Auto-merging wiki/src/install.it.po Auto-merging wiki/src/donate.es.po CONFLICT (content): Merge conflict in wiki/src/donate.es.po Auto-merging wiki/src/doc/about/requirements.pt.po Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
cacu
Suggestion accepted |
|
cacu
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-amd64-3.7.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.7.build-manifest Removing wiki/src/torrents/files/tails-amd64-3.6.2.torrent Removing wiki/src/torrents/files/tails-amd64-3.6.2.iso.sig Auto-merging wiki/src/support.de.po CONFLICT (content): Merge conflict in wiki/src/support.de.po Auto-merging wiki/src/partners.fr.po Auto-merging wiki/src/partners.de.po CONFLICT (content): Merge conflict in wiki/src/partners.de.po Auto-merging wiki/src/news/version_3.6.2.pt.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.pt.po Auto-merging wiki/src/news/version_3.6.2.fr.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.2.fr.po Auto-merging wiki/src/news/test_3.6~rc1.de.po CONFLICT (content): Merge conflict in wiki/src/news/test_3.6~rc1.de.po Auto-merging wiki/src/news/duckduckgo_challenge.de.po CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.de.po Auto-merging wiki/src/doc/sensitive_documents/metadata.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/sensitive_documents/metadata.fr.po Auto-merging wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/mac_spoofing.de.po Auto-merging wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/bridge_mode.inline.de.po Auto-merging wiki/src/doc/about/requirements.pt.po CONFLICT (content): Merge conflict in wiki/src/doc/about/requirements.pt.po Auto-merging wiki/src/doc/about/finances.de.po CONFLICT (content): Merge conflict in wiki/src/doc/about/finances.de.po Auto-merging po/ca.po Removing features/images/TorBrowserSavedStartupPage.png Removing features/images/TorBrowserPrintDialog.png Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago |
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion added |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion accepted |
|
cacu
Suggestion added |
|
cacu
Suggestion added |
|
cacu
Suggestion added |
|
cacu
Suggestion accepted |
|