[midPoint-git] [Evolveum/midpoint] da428f: fix for MID-5445 (resolved conflicts)

[Katarina Valalikova]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: da428fb10cee85e2a0d26e383c04588f9b5f7ab5
      https://github.com/Evolveum/midpoint/commit/da428fb10cee85e2a0d26e383c04588f9b5f7ab5
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2019-06-13 (Thu, 13 Jun 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerValueWrapper.java

  Log Message:
  -----------
  fix for MID-5445 (resolved conflicts)