[vz-dev] Failed: andig/volkszaehler.org#1776 (wip-next-chartjs - 74aef3c)

[Travis CI]

Build Update for andig/volkszaehler.org
-------------------------------------

Build: #1776
Status: Failed

Duration: 2 minutes and 44 seconds
Commit: 74aef3c (wip-next-chartjs)
Author: andig
Message: Merge branch 'next' into wip-next-chartjs

# Conflicts:
#	htdocs/js/plot.js
#	htdocs/js/wui.js

View the changeset: https://github.com/andig/volkszaehler.org/compare/33e0bfa21e5b...74aef3c2bace

View the full build log and details: https://travis-ci.org/andig/volkszaehler.org/builds/334346870?utm_source=email&utm_medium=notification

--

You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://demo.volkszaehler.org/pipermail/volkszaehler-dev/attachments/20180128/492b19b7/attachment.html>