emmapeel

Changes pushed
Changes pushed 04/01/2018
emmapeel

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)
03/31/2018
emmapeel

Changes pushed
Changes pushed 03/29/2018
emmapeel

Changes pushed
Changes pushed 03/29/2018
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 03/29/2018
emmapeel

Changes pushed
Changes pushed 03/29/2018
emmapeel

Resource updated
The “wiki/src/install/inc/steps/download.inline.es.po” file was changed. 03/29/2018
emmapeel

Resource updated
The “wiki/src/install/inc/steps/download.inline.fr.po” file was changed. 03/29/2018
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 03/29/2018
emmapeel

Suggestion removed
0: phy0: Wireless LAN
Soft blocked: no
Hard blocked: no
1: hci0: Bluetooth
Soft blocked: yes
Hard blocked: no
2: gps0: GPS
Soft blocked: no
Hard blocked: no
 
03/29/2018
emmapeel

Changes pushed
Changes pushed 03/28/2018
emmapeel

Changes pushed
Changes pushed 03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Changes pushed
Changes pushed 03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Translation changed
[[!toc levels=2]]
[[!toc levels=2]]
03/28/2018
emmapeel

Repository merge failed

 
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.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fr.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.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.es.po
Auto-merging wiki/src/news/version_3.6.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.de.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.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.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po
Auto-merging wiki/src/news/version_3.6.1.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.es.po
Auto-merging wiki/src/news/version_3.6.1.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.de.po
Auto-merging wiki/src/news/duckduckgo_challenge.es.po
CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.es.po
Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Auto-merging wiki/src/contribute/how/user_experience.mdwn
Auto-merging wiki/src/contribute.it.po
CONFLICT (content): Merge conflict in wiki/src/contribute.it.po
Auto-merging wiki/src/contribute.es.po
Auto-merging wiki/src/about/contact.pt.po
CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po
Auto-merging wiki/src/about/contact.it.po
Auto-merging wiki/src/about/contact.fa.po
Auto-merging wiki/src/about/contact.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/28/2018

Search