fix: Resolve conflicts

frappe · Jun 30, 2023 · 3fb3b1c · 3fb3b1c
1 parent e030e3b
commit 3fb3b1c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss
@@ -103,12 +103,8 @@
 }
 
 .group-by-button.btn-primary-light {
-<<<<<<< HEAD
-	color: var(--blue-500);
-=======
 	color: var(--text-on-blue);
 	outline: 1px solid var(--bg-dark-blue);
->>>>>>> 85145c2c11 (fix: styling of group by button)
 }
 
 .group-by-icon.active {