feature: conflict resolved

This commit is contained in:
gaelle morin
2021-01-22 16:26:19 +01:00
38 changed files with 594 additions and 598 deletions

View File

@ -1,4 +1,4 @@
div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal
div.segment.full.padding-top-small.padding-right-large.padding-bottom-small.padding-left-large.sm-padding-xsmall.border-bottom.border-color-grey.whitespace-normal.bg-color-white
solid-display.labelled-avatar.small(
bind-resources
fields='segment1(account.picture), segment2(name, hyphen, at, username)'