[midPoint-git] [Evolveum/midpoint] c03a0d: Fix conflict checking code (related to MID-5537)

[mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c03a0d7a1e1dde74c5d06ef820e4fe41d44afdaa
      https://github.com/Evolveum/midpoint/commit/c03a0d7a1e1dde74c5d06ef820e4fe41d44afdaa
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-08-08 (Thu, 08 Aug 2019)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/ModelImplUtils.java

  Log Message:
  -----------
  Fix conflict checking code (related to MID-5537)


  Commit: f5982d2c6e4e505a7f584de66068d4767c64af3d
      https://github.com/Evolveum/midpoint/commit/f5982d2c6e4e505a7f584de66068d4767c64af3d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-08-08 (Thu, 08 Aug 2019)

  Changed paths:
    M model/model-intest/pom.xml

  Log Message:
  -----------
  Add midpoint-localization dependency to tests


Compare: https://github.com/Evolveum/midpoint/compare/f1b47816d8d8...f5982d2c6e4e