Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-14 16:21:55 +00:00
parent f19fa92b31
commit 1d601e1be7
29 changed files with 788 additions and 104 deletions

View File

@@ -115,7 +115,7 @@ public class AssociationRef implements EntityRef, Serializable
{
return true;
}
if (!(o instanceof ChildAssociationRef))
if (!(o instanceof AssociationRef))
{
return false;
}

View File

@@ -70,6 +70,7 @@ public interface RepositoryExporterService
{
public StoreRef storeRef;
public String packageName;
public String mimeType;
}
/**