aboutsummaryrefslogtreecommitdiff
path: root/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
diff options
context:
space:
mode:
authorAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
committerAllan Wang <allanwang@google.com>2019-07-27 17:46:04 -0700
commit50c8012e2fe88d6b275d1a3269033590962caa7f (patch)
tree65ebb32525be83441e6caac8362e3e9ae022bfd1 /sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
parent01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff)
parentd94017e6f6df67e80604111028ea16f6c7f4e077 (diff)
downloadkau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2
kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip
Fix initial conflicts
Diffstat (limited to 'sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt')
-rw-r--r--sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt b/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
index 2fedbeb..8c35c77 100644
--- a/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
+++ b/sample/src/main/kotlin/ca/allanwang/kau/sample/AdapterActivity.kt
@@ -22,7 +22,7 @@ import ca.allanwang.kau.ui.activities.ElasticRecyclerActivity
import ca.allanwang.kau.utils.toast
import com.mikepenz.fastadapter.IItem
import com.mikepenz.fastadapter.adapters.ItemAdapter
-import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
+import com.mikepenz.google_material_typeface_library.GoogleMaterial
/**
* Created by Allan Wang on 2017-07-17.