Projects >> packages_apps_DeskClock >>e8d2668517e7e5b3e18f6c92949d2d4a673ec5b3

Chunk
Conflicting content 
=======
import android.widget.ListView;
import android.widget.TextView;

<<<<<<< HEAD
import java.text.DateFormatSymbols;
>>>>>>> da3b21c3fb5227cfabe7fefa777470d7a4604bb0
import java.util.Calendar;

/**
Solution content 
import android.widget.ListView;
import android.widget.TextView;

import java.util.Calendar;

/**
File
AlarmClock.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        public View newView(Context context, Cursor cursor, ViewGroup parent) {
            View ret = mFactory.inflate(R.layout.alarm_time, parent, false);

<<<<<<< HEAD
            ((TextView) ret.findViewById(R.id.am)).setText(mAm);
            ((TextView) ret.findViewById(R.id.pm)).setText(mPm);

            DigitalClock digitalClock =
                    (DigitalClock) ret.findViewById(R.id.digitalClock);
=======
            DigitalClock digitalClock = (DigitalClock)ret.findViewById(R.id.digitalClock);
>>>>>>> da3b21c3fb5227cfabe7fefa777470d7a4604bb0
            digitalClock.setLive(false);
            return ret;
        }
Solution content 
        public View newView(Context context, Cursor cursor, ViewGroup parent) {
            View ret = mFactory.inflate(R.layout.alarm_time, parent, false);

            DigitalClock digitalClock =
                    (DigitalClock) ret.findViewById(R.id.digitalClock);
            digitalClock.setLive(false);
            return ret;
        }
File
AlarmClock.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Method invocation
Variable