fixed merge conflicts
This commit is contained in:
commit
94cebb119a
1 changed files with 0 additions and 1 deletions
|
@ -35,7 +35,6 @@
|
|||
android:layout_marginBottom="4dp"
|
||||
android:layout_gravity="end"
|
||||
android:background="@drawable/roundcorner"/>
|
||||
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
<android.support.design.widget.TabLayout
|
||||
|
|
Loading…
Reference in a new issue