[Debian-handbook-translators] [SCM] Git repository for debian-handbook branch, squeeze/master, updated. debian/6.0+20121031-12-g2230def

[Raphael Hertzog]

Hello,

On Mon, 12 Nov 2012, helight_guest wrote:
> The following commit has been merged in the squeeze/master branch:
> commit 2230deffa6730cec1de119e2956790283da54dc4
> Author: helight_guest <helight.xu at gmail.com>
> Date:   Tue Nov 13 02:45:45 2012 +0800
> 
>     translate zh-CN/90_derivative-distributions.po

You did some translation work in Weblate too and this conflicted with what
you committed.

I have dropped your changes on the weblate side but I put the PO file in
attachement in there was something to rescue...

But in the future don't mix direct Git usage and Weblate, please.

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/