fixed merge conflicts

This commit is contained in:
Severiano Jaramillo 2017-11-29 01:50:46 -06:00
commit 94cebb119a

View file

@ -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