[midPoint-git] [Evolveum/midpoint] f91ee7: resolved conflicts after merge

[Katarina Valalikova]

  Branch: refs/heads/feature/resource-pages
  Home:   https://github.com/Evolveum/midpoint
  Commit: f91ee726f74cac6f126715a9a8960a4106460973
      https://github.com/Evolveum/midpoint/commit/f91ee726f74cac6f126715a9a8960a4106460973
  Author: Katarina Valalikova <k.valalikova at evolveum.com>
  Date:   2016-01-22 (Fri, 22 Jan 2016)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java

  Log Message:
  -----------
  resolved conflicts after merge