Resolved merge conflict in Announcements.css

deepthikannan · deepthikannan · commit 7325e7e5a3de · 2024-08-23T01:01:10.000-07:00
diff --git a/src/components/Announcements/Announcements.css b/src/components/Announcements/Announcements.css
@@ -135,3 +135,4 @@ button.send-button:hover {
       box-sizing: border-box; /* Ensures padding is included in width */
   }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -135,3 +135,4 @@ button.send-button:hover {`
`135`	`135`	`box-sizing: border-box; /* Ensures padding is included in width */`
`136`	`136`	`}`
`137`	`137`	`}`
	`138`	`+`