Skip to content

Commit

Permalink
Merge remote-tracking branch 'master/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
andremw96 committed Oct 29, 2018
2 parents f476f40 + cd6c537 commit ee26b7a
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import org.jetbrains.anko.setContentView

class DetailActivity : AppCompatActivity(), DetailView {

/*companion object {
companion object {
const val dataParcel = "data_parcel"
}*/
}


private lateinit var detailView: ScrollView
Expand Down

0 comments on commit ee26b7a

Please sign in to comment.