cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion added

 
6 years ago
cacu

Suggestion added

 
6 years ago
cacu

Repository merge failed

Auto-merging wiki/src/upgrade/tails.pt.po
Auto-merging wiki/src/upgrade/tails.it.po
Auto-merging wiki/src/upgrade/tails.fa.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.fa.po
Auto-merging wiki/src/upgrade/tails.es.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.es.po
Auto-merging wiki/src/support/known_issues.es.po
CONFLICT (content): Merge conflict in wiki/src/support/known_issues.es.po
Auto-merging wiki/src/news/version_3.6.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po
Auto-merging wiki/src/news/version_3.6.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.es.po
Auto-merging wiki/src/news/version_3.6.1.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po
Auto-merging wiki/src/news/version_3.6.1.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.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
Auto-merging wiki/src/news/version_3.6.1.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po
Auto-merging wiki/src/news/version_3.6.1.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.es.po
Auto-merging wiki/src/news/version_3.6.1.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.de.po
CONFLICT (modify/delete): wiki/src/news/version_3.5/manual_upgrade.inline.pt.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_3.5/manual_upgrade.inline.pt.po left in tree.
Removing wiki/src/news/version_3.5/manual_upgrade.inline.mdwn
Removing wiki/src/news/version_3.5/manual_upgrade.inline.it.po
Removing wiki/src/news/version_3.5/manual_upgrade.inline.fr.po
Removing wiki/src/news/version_3.5/manual_upgrade.inline.fa.po
CONFLICT (modify/delete): wiki/src/news/version_3.5/manual_upgrade.inline.es.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/news/version_3.5/manual_upgrade.inline.es.po left in tree.
Removing wiki/src/news/version_3.5/manual_upgrade.inline.de.po
Auto-merging wiki/src/doc/first_steps/upgrade.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.es.po
Auto-merging wiki/src/doc/anonymous_internet/networkmanager.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/networkmanager.es.po
Auto-merging wiki/src/doc/advanced_topics/virtualization.es.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)
6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion accepted

6 years ago
cacu

Suggestion added

 
6 years ago
cacu

Suggestion accepted

6 years ago

Search