[midPoint-git] [Evolveum/midpoint] d373d0: More post-merge fixes

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: d373d07744f6c20ea3765cad9f7e4e108a510741
      https://github.com/Evolveum/midpoint/commit/d373d07744f6c20ea3765cad9f7e4e108a510741
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2017-10-02 (Mon, 02 Oct 2017)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/PagingType.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java

  Log Message:
  -----------
  More post-merge fixes