None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.8.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.it.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/news/version_3.8.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.fa.po
Auto-merging wiki/src/news/version_3.8.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.es.po
Auto-merging wiki/src/news/version_3.8.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.8.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
07/04/2018

Search