Projects >> nuxeo >>d8e68dc908a5dbd59b4fb274d34ccb3941fe46b8

Chunk
Conflicting content 
import org.nuxeo.functionaltests.Required;
import org.nuxeo.functionaltests.pages.AbstractPage;
import org.nuxeo.functionaltests.pages.DocumentBasePage;
<<<<<<< HEAD
import org.nuxeo.functionaltests.waitfor.ElementNotFoundException;
import org.nuxeo.functionaltests.waitfor.FindElementUntil;
=======
import org.nuxeo.functionaltests.pages.UsersGroupsBasePage;
>>>>>>> 6d1883ac6211957b71bde5943a79df0ef2d762a6
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
Solution content 
import org.nuxeo.functionaltests.Required;
import org.nuxeo.functionaltests.pages.AbstractPage;
import org.nuxeo.functionaltests.pages.DocumentBasePage;
import org.nuxeo.functionaltests.waitfor.ElementNotFoundException;
import org.nuxeo.functionaltests.waitfor.FindElementUntil;
import org.nuxeo.functionaltests.pages.UsersGroupsBasePage;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
File
UserCreationFormPage.java
Developer's decision
Concatenation
Kind of conflict
Import