[midPoint-git] [Evolveum/midpoint] df8663: merge fix

[kate]

  Branch: refs/heads/support-3.9
  Home:   https://github.com/Evolveum/midpoint
  Commit: df8663dc6406e2a84a8a4bde58c11ada76b318d3
      https://github.com/Evolveum/midpoint/commit/df8663dc6406e2a84a8a4bde58c11ada76b318d3
  Author: kate <honchar at evolveum.com>
  Date:   2018-12-06 (Thu, 06 Dec 2018)

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

  Log Message:
  -----------
   merge fix



      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.