Projects >> tvticker >>4c3781f41c43a229aabf188e2f6361ac983bc7ae

Chunk
Conflicting content 
import java.text.ParseException;
import java.util.ArrayList;
<<<<<<< HEAD
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
=======
>>>>>>> 1c228775b4f7fa19164f945277f4724a062f6de9

import android.content.ContentValues;
import android.content.Context;
Solution content 
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import android.content.ContentValues;
import android.content.Context;
File
TvTickerDBAdapter.java
Developer's decision
Combination
Kind of conflict
Import