Changes

Summary

1. merges and merged_in relations

Revision 58355 by michele.artini: merges and merged_in relations
Change Type	Path in Repository	Path in Workspace
	/dnet45/modules/dnet-orgs-database-application/trunk/src/main/java/eu/dnetlib/organizations/model/OpenaireConflictPK.java	src/main/java/eu/dnetlib/organizations/model/OpenaireConflictPK.java
	/dnet45/modules/dnet-orgs-database-application/trunk/src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java	src/main/java/eu/dnetlib/organizations/utils/DatabaseUtils.java
	/dnet45/modules/dnet-orgs-database-application/trunk/src/main/java/eu/dnetlib/organizations/utils/RelationType.java	src/main/java/eu/dnetlib/organizations/utils/RelationType.java