|
None
Changes pushed |
Changes pushed
08/25/2018
|
|
None
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
Auto-merging wiki/src/upgrade/tails-overview.it.po Auto-merging wiki/src/upgrade/tails-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.fr.po Auto-merging wiki/src/upgrade/tails-overview.fa.po Auto-merging wiki/src/upgrade/clone-overview.it.po Auto-merging wiki/src/upgrade/clone-overview.fr.po CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.fr.po 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.de.po Auto-merging wiki/src/news/report_2018_07.mdwn Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.pt.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po Auto-merging wiki/src/install/inc/overview.it.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.it.po Auto-merging wiki/src/install/inc/overview.fa.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.fa.po Auto-merging wiki/src/install/inc/overview.es.po CONFLICT (content): Merge conflict in wiki/src/install/inc/overview.es.po Auto-merging wiki/src/doc/first_steps/startup_options/administration_password.fa.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options/administration_password.fa.po Automatic merge failed; fix conflicts and then commit the result. (1)08/25/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |
|
None
Repository merge failed |
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.de.po Auto-merging wiki/src/install/mac.it.po CONFLICT (content): Merge conflict in wiki/src/install/mac.it.po Auto-merging wiki/src/install/mac.fr.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fr.po Auto-merging wiki/src/install/mac.fa.po CONFLICT (content): Merge conflict in wiki/src/install/mac.fa.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Automatic merge failed; fix conflicts and then commit the result. (1)08/11/2018 |