Projects >> fanfoudroid >>036a7845a8f76e42b3a48c62aa70211a49c613ea

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

<<<<<<< HEAD:src/com/ch_linghu/android/fanfoudroid/ui/DmActivity.java
import com.ch_linghu.android.fanfoudroid.R;
import com.ch_linghu.android.fanfoudroid.TwitterApi;
import com.ch_linghu.android.fanfoudroid.TwitterApi.ApiException;
import com.ch_linghu.android.fanfoudroid.TwitterApi.AuthException;
import com.ch_linghu.android.fanfoudroid.TwitterApplication;
import com.ch_linghu.android.fanfoudroid.data.Dm;
import com.ch_linghu.android.fanfoudroid.data.db.TwitterDbAdapter;
import com.ch_linghu.android.fanfoudroid.helper.ImageManager;
import com.ch_linghu.android.fanfoudroid.helper.Preferences;
import com.ch_linghu.android.fanfoudroid.helper.Utils;
import com.ch_linghu.android.fanfoudroid.ui.base.WithHeaderActivity;
=======
import com.ch_linghu.fanfoudroid.R;
import com.ch_linghu.fanfoudroid.TwitterApi.ApiException;
import com.ch_linghu.fanfoudroid.TwitterApi.AuthException;
import com.ch_linghu.fanfoudroid.data.Dm;
import com.ch_linghu.fanfoudroid.data.db.TwitterDbAdapter;
import com.ch_linghu.fanfoudroid.helper.ImageManager;
import com.ch_linghu.fanfoudroid.helper.Preferences;
import com.ch_linghu.fanfoudroid.helper.Utils;
import com.ch_linghu.fanfoudroid.ui.base.WithHeaderActivity;
import com.ch_linghu.fanfoudroid.ui.module.TweetEdit;
>>>>>>> db988c7bb09bdb624586fe47042107943911ab1e:src/com/ch_linghu/fanfoudroid/DmActivity.java
import com.google.android.photostream.UserTask;

public class DmActivity extends WithHeaderActivity {
Solution content 
import android.widget.ListView;
import android.widget.TextView;

import com.ch_linghu.fanfoudroid.TwitterApi.ApiException;
import com.ch_linghu.fanfoudroid.TwitterApi.AuthException;
import com.ch_linghu.fanfoudroid.data.Dm;
import com.ch_linghu.fanfoudroid.data.db.TwitterDbAdapter;
import com.ch_linghu.fanfoudroid.helper.ImageManager;
import com.ch_linghu.fanfoudroid.helper.Preferences;
import com.ch_linghu.fanfoudroid.helper.Utils;
import com.ch_linghu.fanfoudroid.ui.base.WithHeaderActivity;
import com.google.android.photostream.UserTask;

public class DmActivity extends WithHeaderActivity {
File
DmActivity.java
Developer's decision
Combination
Kind of conflict
Import