Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5217 from ToolJet/v1-to-v2

Browse source 
Fix unmerged styles
This commit is contained in:
Sherfin Shamsudeen 2023-01-05 17:14:30 +05:30 committed by GitHub
commit 8da8363d11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/_styles/theme.scss
View file

@ -7330,7 +7330,6 @@ tbody {
}
}
<<<<<<< HEAD
.user-group-table {
.selected-row {
@ -7345,5 +7344,3 @@ tbody {
color: white !important;
}
}
=======
>>>>>>> develop