[midPoint-git] [Evolveum/prism] cf5af2: merge: merge annotation added

[Viliam Repan]

  Branch: refs/heads/feature/merge
  Home:   https://github.com/Evolveum/prism
  Commit: cf5af2ce510d20e09c6b480f55a13a591a72db2e
      https://github.com/Evolveum/prism/commit/cf5af2ce510d20e09c6b480f55a13a591a72db2e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-03-11 (Mon, 11 Mar 2024)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Definition.java
    A infra/prism-api/src/main/java/com/evolveum/midpoint/prism/Merge.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableDefinition.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/DummyPrismObjectDefinition.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/annotation/Annotation.java
    M infra/prism-impl/src/main/resources/xml/ns/public/annotation-3.xsd

  Log Message:
  -----------
  merge: merge annotation added



To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/prism/settings/notifications