[vz-dev] [volkszaehler/volkszaehler.org] b2d1ed: Fix merge errors

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/volkszaehler/volkszaehler.org
  Commit: b2d1ed7018c108b5befbbe56e2bb4d6aae68febd
      https://github.com/volkszaehler/volkszaehler.org/commit/b2d1ed7018c108b5befbbe56e2bb4d6aae68febd
  Author: andig <cpuidle at gmx.de>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M lib/View/JSON.php

  Log Message:
  -----------
  Fix merge errors


  Commit: e9357d229732e414a182b60a648e54be485426f0
      https://github.com/volkszaehler/volkszaehler.org/commit/e9357d229732e414a182b60a648e54be485426f0
  Author: andig <cpuidle at gmx.de>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M lib/View/JSON.php

  Log Message:
  -----------
  Merge pull request #342 from andig/master

Fix merge errors


Compare: https://github.com/volkszaehler/volkszaehler.org/compare/984a628d3932...e9357d229732