From be9f4f6f04a564345d18dd5508f9dcbc77af799d Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Wed, 21 Sep 2016 15:40:27 +0300 Subject: [PATCH] fixed merge error --- .../org_alfresco_module_rm/test/util/{ => bdt}/BehaviourTest.java | 0 .../test/util/{ => bdt}/ExpectedFailure.java | 0 .../org_alfresco_module_rm/test/util/{ => bdt}/ExpectedValue.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/{ => bdt}/BehaviourTest.java (100%) rename rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/{ => bdt}/ExpectedFailure.java (100%) rename rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/{ => bdt}/ExpectedValue.java (100%) diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BehaviourTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java similarity index 100% rename from rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BehaviourTest.java rename to rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/BehaviourTest.java diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedFailure.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedFailure.java similarity index 100% rename from rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedFailure.java rename to rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedFailure.java diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedValue.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedValue.java similarity index 100% rename from rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExpectedValue.java rename to rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/bdt/ExpectedValue.java