[midPoint-git] [Evolveum/midpoint] d08849: User friendy error messages conflicts resolved

[Katarina Valalikova]

  Branch: refs/heads/support-3.6
  Home:   https://github.com/Evolveum/midpoint
  Commit: d0884946f4263bff9cd36ba550931a0f05637a8b
      https://github.com/Evolveum/midpoint/commit/d0884946f4263bff9cd36ba550931a0f05637a8b
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2017-08-25 (Fri, 25 Aug 2017)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OpResult.java

  Log Message:
  -----------
  User friendy error messages conflicts resolved