[midPoint-git] [Evolveum/midpoint] 19af5c: Fixing shcema type (MID-4699)

[Radovan Semancik]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 19af5c9520b7dedad835a3600c8e185ad2533594
      https://github.com/Evolveum/midpoint/commit/19af5c9520b7dedad835a3600c8e185ad2533594
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2018-09-14 (Fri, 14 Sep 2018)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java

  Log Message:
  -----------
  Fixing shcema type (MID-4699)



      **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.