fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic
2022-05-09 12:07:02 +01:00
parent a4bbf8f233
commit 3ce8041a12
12 changed files with 26 additions and 26 deletions

View File

@@ -276,7 +276,7 @@ export default {
@import './../../css/variables';
.stack {
width: $stack-width + $stack-spacing*3;
width: $stack-width + $stack-spacing * 3;
margin-left: math.div($stack-spacing, 2);
margin-right: math.div($stack-spacing, 2);
}