# Conflicts: # src/main/java/org/alfresco/rest/model/RestProcessDefinitionModel.java # src/main/java/org/alfresco/rest/model/RestProcessModelsCollection.java # src/test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java # src/test/java/org/alfresco/rest/workflow/processes/DeleteProcessSanityTests.java # src/test/java/org/alfresco/rest/workflow/processes/GetProcessesSanityTests.java