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