Skip to content

Commit

Permalink
chore(PPDSC-1852): chore-ppdse-1852-sorted merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
baburay23 committed Aug 25, 2022
2 parents 2189d7b + dd9803c commit 2ef0f8f
Show file tree
Hide file tree
Showing 125 changed files with 12,502 additions and 12,527 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ exports[`EnumTable renders enum as expected 1`] = `
line-height: 1.5;
font-weight: 400;
letter-spacing: 0;
background-color: #FFFFFF;
box-shadow: 0 3px 4px 2px #FFFFFF;
background-color: #F0F1F3;
box-shadow: 0 3px 4px 2px #F0F1F3;
}
.emotion-1,
.emotion-1 td,
.emotion-1 th {
color: #0A0A0A;
color: #09111C;
border-spacing: 0;
border: solid 1px #E4E4E4;
border: solid 1px #DEE2E5;
}
.emotion-1 td,
Expand Down
Loading

0 comments on commit 2ef0f8f

Please sign in to comment.