Resolve conflicts
This commit is contained in:
commit
3b611313e1
524 changed files with 15162 additions and 3736 deletions
|
@ -357,7 +357,7 @@ impl RenderOnce for SshConnectionHeader {
|
|||
.rounded_t_sm()
|
||||
.w_full()
|
||||
.gap_1p5()
|
||||
.child(Icon::new(IconName::Server).size(IconSize::XSmall))
|
||||
.child(Icon::new(IconName::Server).size(IconSize::Small))
|
||||
.child(
|
||||
h_flex()
|
||||
.gap_1()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue