# Conflicts: # src/test/java/org/alfresco/rest/GetSitesTests.java # src/test/java/org/alfresco/rest/comments/GetCommentsSanityTests.java # src/test/java/org/alfresco/rest/demo/RestDemoTests.java # src/test/java/org/alfresco/rest/sites/AddSiteMembershipRequestSanityTests.java # src/test/java/org/alfresco/rest/sites/GetSiteSanityTests.java # src/test/java/org/alfresco/rest/sites/GetSitesSanityTests.java