[Qgis-community-team] QGIS-Documentation master now building on Travis

[DelazJ]

I will try to give it a look tonight. But a quick check lets me think that
the conflict has to do with the following commit
https://github.com/qgis/QGIS-Documentation/commit/043211623702c17798efd124d1bb77832a4cf810

2016-01-20 13:21 GMT+01:00 Richard Duivenvoorde <richard at duif.net>:

> On 19-01-16 19:11, DelazJ wrote:
> > Hi,
> > The errors in the general tools chapter should be fixed with the PR #658
> > (https://github.com/qgis/QGIS-Documentation/pull/658)
>
> Hi, Can you please have a look at current status of the docs.
>
> As it is now, I cannot cleanly merge your changes.
> It is probably easier for you then for me to see where the problem is.
>
> Regards,
>
> Richard
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-community-team/attachments/20160120/4ec83ed0/attachment.html>