fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-05-09 12:07:02 +01:00
parent a4bbf8f233
commit 3ce8041a12
12 changed files with 26 additions and 26 deletions
--- a/src/components/cards/CardItem.vue
+++ b/src/components/cards/CardItem.vue
@@ -232,6 +232,7 @@ export default {
 			}
 		}

+		/* stylelint-disable-next-line no-invalid-position-at-import-rule */
 		@import './../../css/labels';

 		.card-controls {