Projects >> apptentive-android >>0e48d593bc5dbed1d633d8bb36231a7e8b771113

Chunk
Conflicting content 
import android.content.Context;
import android.content.SharedPreferences;
<<<<<<< HEAD
import android.net.Uri;
=======
>>>>>>> a2fc4c2ca10fe83f6696941af57fc056f94103f7
import android.text.TextUtils;

import com.apptentive.android.sdk.GlobalInfo;
Solution content 
import android.content.Context;
import android.content.SharedPreferences;
import android.net.Uri;
import android.text.TextUtils;

import com.apptentive.android.sdk.GlobalInfo;
File
ApptentiveClient.java
Developer's decision
Version 1
Kind of conflict
Import