merge issue 2

HIMU-2001 · HIMU-2001 · commit 5e708ab4194f · 2025-06-18T06:35:09.000+05:30
Signed-off-by: HIMANSHU RAI &lt;himanshuuu.2001@gmail.com&gt;
diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss
@@ -721,8 +721,6 @@ a:not([href]):not([class]):hover {
 .csvtable {
   width: 100%;
 }
-<<<<<<< HEAD
-=======
 
 // Only target the tabbed panels using ID naming convention
 
@@ -763,4 +761,3 @@ a:not([href]):not([class]):hover {
   }
 }
 
->>>>>>> 3b1c4297 (tabbed content visibility)

Original file line number	Diff line number	Diff line change
`@@ -721,8 +721,6 @@ a:not([href]):not([class]):hover {`
`721`	`721`	`.csvtable {`
`722`	`722`	`width: 100%;`
`723`	`723`	`}`
`724`		`-<<<<<<< HEAD`
`725`		`-=======`
`726`	`724`
`727`	`725`	`// Only target the tabbed panels using ID naming convention`
`728`	`726`
`@@ -763,4 +761,3 @@ a:not([href]):not([class]):hover {`
`763`	`761`	`}`
`764`	`762`	`}`
`765`	`763`
`766`		`->>>>>>> 3b1c4297 (tabbed content visibility)`