|
None
Repository merge failed |
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 |
|
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 |
|
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/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/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
Changes pushed |
Changes pushed
08/11/2018
|
|
None
Repository merged |
Repository merged
Original revision: N/A New revision: N/A 08/11/2018 |
|
None
Changes pushed |
Changes pushed
08/10/2018
|