|
None
Repository merge failed |
08/26/2018
|
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-download.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.de.po Auto-merging wiki/src/upgrade/clone.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.de.po Auto-merging wiki/src/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/upgrade.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.de.po Auto-merging wiki/src/security/Numerous_security_holes_in_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/security/Numerous_security_holes_in_3.7.1.de.po Auto-merging wiki/src/news/version_3.8.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po Auto-merging wiki/src/news/version_3.7.1.de.po CONFLICT (content): Merge conflict in wiki/src/news/version_3.7.1.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/26/2018 |