|
emmapeel
Repository merge failed |
8 years ago
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po CONFLICT (content): Merge conflict in wiki/src/security/claws_mail_leaks_plaintext_to_imap.fr.po Auto-merging wiki/src/doc/first_steps/installation/manual/linux.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/linux.de.po Auto-merging wiki/src/doc/anonymous_internet/pidgin.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/pidgin.de.po Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago |