emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues/graphics.pt.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues/graphics.pt.po
Auto-merging wiki/src/support/known_issues/graphics.fr.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues/graphics.fr.po
Auto-merging wiki/src/support/known_issues/graphics.es.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues/graphics.es.po
Auto-merging wiki/src/support/known_issues.pt.po
CONFLICT (content): Merge conflict in 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/install/mac/dvd.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.pt.po
Auto-merging wiki/src/install/mac/dvd.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.it.po
Auto-merging wiki/src/install/mac/dvd.fr.po
Auto-merging wiki/src/install/mac/dvd.fa.po
Auto-merging wiki/src/install/mac/dvd.es.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.es.po
Auto-merging wiki/src/install/mac/dvd.de.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd.de.po
Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.it.po
Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.fa.po
Auto-merging wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virtualbox.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)
05/02/2018
emmapeel

Changes pushed

Changes pushed 04/30/2018
emmapeel

Changes pushed

Changes pushed 04/30/2018
emmapeel

Changes pushed

Changes pushed 04/30/2018
emmapeel

Changes pushed

Changes pushed 04/30/2018
mrsf

Changes pushed

Changes pushed 04/29/2018
mrsf

Changes pushed

Changes pushed 04/29/2018
emmapeel

Changes pushed

Changes pushed 04/29/2018
emmapeel

Changes pushed

Changes pushed 04/29/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 04/29/2018
emmapeel

Changes pushed

Changes pushed 04/28/2018
emmapeel

Changes pushed

Changes pushed 04/28/2018
emmapeel

Changes pushed

Changes pushed 04/28/2018
emmapeel

Changes pushed

Changes pushed 04/28/2018
emmapeel

Changes pushed

Changes pushed 04/28/2018
emmapeel

Changes pushed

Changes pushed 04/27/2018
emmapeel

Changes pushed

Changes pushed 04/27/2018
emmapeel

Changes pushed

Changes pushed 04/27/2018
emmapeel

Changes pushed

Changes pushed 04/27/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 04/27/2018

Search