emmapeel

Repository merge failed

Auto-merging wiki/src/doc/first_steps/bug_reporting.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.pt.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.it.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/26/2018
admin

Changes pushed

Changes pushed 03/23/2018
admin

Changes pushed

Changes pushed 03/23/2018
admin

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 03/23/2018
admin

Changes pushed

Changes pushed 03/23/2018
admin

Repository merge failed

Auto-merging wiki/src/press.pt.po
CONFLICT (content): Merge conflict in wiki/src/press.pt.po
Auto-merging wiki/src/press.it.po
Auto-merging wiki/src/press.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/23/2018
admin

Changes pushed

Changes pushed 03/22/2018
None

Repository merge failed

Auto-merging wiki/src/news/version_3.6.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fr.po
Auto-merging wiki/src/news/version_3.6.1.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/22/2018
emmapeel

Changes pushed

Changes pushed 03/22/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 03/22/2018
emmapeel

Changes pushed

Changes pushed 03/22/2018
emmapeel

Changes pushed

Changes pushed 03/22/2018
admin

Changes pushed

Changes pushed 03/22/2018
admin

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/22/2018
admin

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/22/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/22/2018
emmapeel

Changes pushed

Changes pushed 03/21/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)
03/21/2018
emmapeel

Changes pushed

Changes pushed 03/21/2018
emmapeel

Changes pushed

Changes pushed 03/21/2018

Search