[qooxdoo-commit] [qooxdoo/next] 2b3e44: Fixed merge conflict

[Martin W. <Mar...@1u...>]

  Branch: refs/heads/binding
  Home:   https://github.com/qooxdoo/next
  Commit: 2b3e44a61edb92ca32373305d1c9e7986b9ae76d
      https://github.com/qooxdoo/next/commit/2b3e44a61edb92ca32373305d1c9e7986b9ae76d
  Author: Martin Wittemann <Mar...@1u...>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M framework/source/class/qx/bom/client/Pdfjs.js
    M tool/grunt/config/application.js
    M tool/grunt/eslint/eslint-plugin-qx-rules/lib/rules/no-illegal-private-usage.js
    M tool/grunt/eslint/eslint.json

  Log Message:
  -----------
  Fixed merge conflict