Projects >> Xebium >>7a07c05240f58cf31d04fe217c59ad78a3b0a728

Chunk
Conflicting content 
package com.xebia.incubator.xebium;

<<<<<<< HEAD
=======
import com.google.common.base.Supplier;
>>>>>>> b9eef973aeafff0aa6b88a7fca8841fd5545bfb2
import com.thoughtworks.selenium.CommandProcessor;
import com.thoughtworks.selenium.HttpCommandProcessor;
import com.thoughtworks.selenium.SeleniumException;
Solution content 
package com.xebia.incubator.xebium;

import com.google.common.base.Supplier;
import com.thoughtworks.selenium.CommandProcessor;
import com.thoughtworks.selenium.HttpCommandProcessor;
import com.thoughtworks.selenium.SeleniumException;
File
SeleniumDriverFixture.java
Developer's decision
Version 2
Kind of conflict
Import