fixed merge error

Browse Source

...

This commit is contained in:

Ana Bozianu

2016-09-21 15:40:27 +03:00

parent a4030ba15d

commit 16927d264c

3 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BehaviourTest.java → rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java

0

rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedFailure.java → rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedFailure.java

0

rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedValue.java → rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedValue.java