Skip to content

Commit

Permalink
Merge branch 'release/32.x' into release/33.x
Browse files Browse the repository at this point in the history
* release/32.x:
  #4869 - Cannot re-merge curation document

% Conflicts:
%	inception/inception-ui-curation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java
  • Loading branch information
reckart committed Jun 11, 2024
2 parents 80df76f + 0284f51 commit ee1da77
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ee1da77

Please sign in to comment.