# Conflicts: # src/main/java/org/alfresco/rest/model/RestErrorModel.java # src/test/java/org/alfresco/rest/favorites/DeleteFavoriteSanityTests.java