fix merge here

RahulKhanna14 · RahulKhanna14 · commit 536c63110f92 · 2025-01-28T11:38:35.000-08:00
diff --git a/website/src/caseStudies/FacialRecognition.js b/website/src/caseStudies/FacialRecognition.js
@@ -25,7 +25,7 @@ const FacialRecognitionInfo = [
     post: {
       profilePic: teachLogo,
       profilePicName: "Profile Picture - TeachLA Logo",
-      header: "Case Study #3: Facial Recognition",
+      header: "Case Study #3: Face Recognition",
       subheader: "Stay Tuned For More!",
       bodyText: [
         {
diff --git a/website/src/components/posts/Facebook/conclusion/conclusion.css b/website/src/components/posts/Facebook/conclusion/conclusion.css
@@ -76,3 +76,7 @@
 .fade-exit-active {
   transition: opacity 500ms;
 }
+
+.gray {
+  background-color: gray;
+}

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ const FacialRecognitionInfo = [`
`25`	`25`	`post: {`
`26`	`26`	`profilePic: teachLogo,`
`27`	`27`	`profilePicName: "Profile Picture - TeachLA Logo",`
`28`		`- header: "Case Study #3: Facial Recognition",`
	`28`	`+ header: "Case Study #3: Face Recognition",`
`29`	`29`	`subheader: "Stay Tuned For More!",`
`30`	`30`	`bodyText: [`
`31`	`31`	`{`