Hi,
I rebased and skipped the file now. I pushed back to my repo, could
you give it another try? Otherwise I will fix it manually.
Cheers!
spriver
Muri Nicanor: > $ git merge spriver/de_your_data Auto-merging
> wiki/src/doc/first_steps/upgrade.fr.po CONFLICT (content): Merge
> conflict in wiki/src/doc/first_steps/upgrade.fr.po Automatic merge
> failed; fix conflicts and then commit the result.
>
> i think that file shouldn't even be changed by that commit?
>
> cheers, muri
>
> On 11/22/2015 08:08 PM, spriver wrote:
>> Hi,
>>
>> I translated the topic-mentioned page. Please review:
>>
>> https://gitlab.com/spriver/tails.git branch: de_your_data latest
>> commit: 052b5372 Fixed link and spelling after rebase
>>
>> Cheers! spriver _______________________________________________
>> Tails-l10n mailing list Tails-l10n@???
>> https://mailman.boum.org/listinfo/tails-l10n To unsubscribe from
>> this list, send an empty email to
>> Tails-l10n-unsubscribe@???.
>>
>
>
>
> _______________________________________________ Tails-l10n mailing
> list Tails-l10n@???
> https://mailman.boum.org/listinfo/tails-l10n To unsubscribe from
> this list, send an empty email to Tails-l10n-unsubscribe@???.
>
