[midPoint-git] [Evolveum/midpoint] 516dcd: Adapting test to new conflict resolution rule.

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 516dcd6c1e9045acf916051bb0714661ce8c78b0
      https://github.com/Evolveum/midpoint/commit/516dcd6c1e9045acf916051bb0714661ce8c78b0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2017-10-24 (Tue, 24 Oct 2017)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java

  Log Message:
  -----------
  Adapting test to new conflict resolution rule.