Fix bad rebase

Author: niftynei

app/src/main/java/com/zulip/android/util/CustomHtmlToSpannedConverter.java

@@ -24,10 +24,7 @@
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
-<<<<<<< e370c9bc00e8f6b33b1d12a44b4c70a7f063c8b9
 import android.support.v4.content.ContextCompat;
-=======
->>>>>>> Issue #168 bugfix for links not being clickable, adds autoLink feature including web, phone, map and email
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spannable;