Merge branch 'grid-marks'
# Conflicts: # app/src/main/java/io/github/wulkanowy/activity/main/Login.java # app/src/main/java/io/github/wulkanowy/activity/main/MainActivity.java
This commit is contained in:
@ -1,5 +1,3 @@
|
||||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user