Projects >> AlarmClock >>b9fbee3afa73c4a01d8f751662755439dba03cc9

Chunk
Conflicting content 
import android.view.ViewGroup;
import android.widget.Button;

<<<<<<< HEAD:src/com/premium/alarm/presenter/TimePickerDialogFragment.java
=======
import com.better.alarm.R;
import com.better.alarm.model.AlarmsManager;
import com.better.alarm.model.interfaces.Alarm;
import com.better.alarm.model.interfaces.AlarmNotFoundException;
import com.better.alarm.view.TimePicker;
>>>>>>> 6a5580b40f78b1e418b4eba7f1d2df408fff1f7d:src/com/better/alarm/presenter/TimePickerDialogFragment.java
import com.github.androidutils.logger.Logger;
import com.premium.alarm.R;
import com.premium.alarm.model.AlarmsManager;
Solution content 
import android.view.ViewGroup;
import android.widget.Button;

import com.github.androidutils.logger.Logger;
import com.premium.alarm.R;
import com.premium.alarm.model.AlarmsManager;
File
TimePickerDialogFragment.java
Developer's decision
Version 1
Kind of conflict
Import