Projects >> RapidFTR-Android >>3f377f957906d406f1042779f4e7a08609b6c0f1

Chunk
Conflicting content 
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
<<<<<<< HEAD
=======
import org.mockito.Mockito;
import sun.rmi.runtime.Log;
>>>>>>> 5cba03a772075df65cb4fddb80ed77747edd479e

import static android.content.Context.DEVICE_POLICY_SERVICE;
import static org.mockito.BDDMockito.given;
Solution content 
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import sun.rmi.runtime.Log;

import static android.content.Context.DEVICE_POLICY_SERVICE;
import static org.mockito.BDDMockito.given;
File
DeviceAdminTest.java
Developer's decision
Version 2
Kind of conflict
Import