[midPoint-git] [Evolveum/midpoint] 2b5674: MID-7976 first iteration of conflict resolving

[Viliam Repan]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2b567420d1285c60f12d2eaf611a5621c070e3f7
      https://github.com/Evolveum/midpoint/commit/2b567420d1285c60f12d2eaf611a5621c070e3f7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2022-06-22 (Wed, 22 Jun 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/Conflict.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java

  Log Message:
  -----------
  MID-7976 first iteration of conflict resolving