Claudio Atzori 4e1aac2e2f resolved conflict in pom.xml before applying the changes from [COAR based resource types & Irish tender] #350		2023-11-29 14:37:52 +01:00
..
main	resolved conflict in pom.xml before applying the changes from [COAR based resource types & Irish tender] #350	2023-11-29 14:37:52 +01:00
test	resolved conflict in pom.xml before applying the changes from [COAR based resource types & Irish tender] #350	2023-11-29 14:37:52 +01:00