Skip to content

Commit c2ce5d0

Browse files
authored
Update _styles_project.scss
Signed-off-by: Himanshu Rai <[email protected]>
1 parent 3114377 commit c2ce5d0

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

assets/scss/_styles_project.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,9 +721,6 @@ a:not([href]):not([class]):hover {
721721
.csvtable {
722722
width: 100%;
723723
}
724-
<<<<<<< HEAD
725-
=======
726-
727724
// Only target the tabbed panels using ID naming convention
728725

729726
[id^="tabs-"] {
@@ -762,5 +759,3 @@ a:not([href]):not([class]):hover {
762759
}
763760
}
764761
}
765-
766-
>>>>>>> 3b1c4297 (tabbed content visibility)

0 commit comments

Comments
 (0)