Fix missing rebase conflict

DroidKaigi · Feb 4, 2018 · e73e923 · e73e923
1 parent 1d73ffe
commit e73e923
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/...main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt b/...main/java/io/github/droidkaigi/confsched2018/presentation/sessions/AllSessionsFragment.kt
@@ -106,13 +106,10 @@ class AllSessionsFragment : Fragment(), Injectable, CurrentSessionScroller, TabL
         binding.sessionsRecycler.scrollToPosition(currentSessionPosition)
     }
 
-<<<<<<< HEAD
     override fun scrollToTop() {
         binding.sessionsRecycler.smoothScrollToPosition(0)
     }
 
-=======
->>>>>>> Set Shared element on other sessions fragments
     private fun setupRecyclerView() {
         val groupAdapter = GroupAdapter<ViewHolder>().apply {
             add(sessionsSection)