emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/02/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/02/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/02/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/02/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.it.po
Auto-merging wiki/src/press.it.po
CONFLICT (content): Merge conflict in wiki/src/press.it.po
Auto-merging wiki/src/install/win/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.it.po
Auto-merging wiki/src/install/win.it.po
CONFLICT (content): Merge conflict in wiki/src/install/win.it.po
Auto-merging wiki/src/install/mac/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.it.po
Auto-merging wiki/src/install/linux/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.it.po
Auto-merging wiki/src/install/expert/usb-overview.it.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.it.po
Auto-merging wiki/src/doc/anonymous_internet/tor_status.it.po
Auto-merging wiki/src/doc/anonymous_internet.index.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet.index.it.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/02/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/01/2018
emmapeel

Repository merge failed

Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.it.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.it.po
Auto-merging wiki/src/support/known_issues.fr.po
Auto-merging wiki/src/support/known_issues.fa.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/known_issues.de.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)
11/01/2018
emmapeel

Changes committed

Changes committed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Changes pushed

Changes pushed 11/01/2018
emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 11/01/2018
admin

Changes pushed

Changes pushed 10/31/2018
None

Resource updated

The “wiki/src/index.it.po” file was changed. 10/31/2018
cacu

Changes pushed

Changes pushed 10/30/2018
admin

Changes pushed

Changes pushed 10/30/2018
admin

Changes pushed

Changes pushed 10/30/2018

Search