Merge conflicts resolved

safetrustcr · Feb 22, 2025 · 46a80d2 · 46a80d2
1 parent c61c4f4
commit 46a80d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 30 deletions.
diff --git a/public/styles/globals.css b/public/styles/globals.css
@@ -70,3 +70,15 @@ body {
     @apply bg-background text-foreground;
   }
 }
+
+@keyframes pulse {
+  0% {
+    opacity: 0.5;
+  }
+  50% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0.5;
+  }
+}
diff --git a/src/components/HeroSection.tsx b/src/components/HeroSection.tsx
@@ -3,15 +3,6 @@
 import { Button } from "@/components/ui/button";
 import { Wallet } from "lucide-react";
 
-//!THIS IS AN EXAMPLE OF A COMPONENT THAT IS NOT YET IMPLEMENTED, BUT YOU CAN USE IT AS A REFERENCE TO CREATE YOUR OWN COMPONENTS
-
-// import TestimonialSection from "./testimonial-section"
-// import FeaturesSection from "./features-section"
-// import PricingSection from "./pricing-section"
-// import FAQSection from "./faq-section"
-// import CTASection from "./cta-section"
-// import Footer from "./footer"
-
 export default function HeroSection() {
   return (
     <div className="min-h-screen bg-black text-white">
@@ -72,27 +63,6 @@ export default function HeroSection() {
           </div>
         </div>
       </main>
-
-      {/* <FeaturesSection />
-      <PricingSection />
-      <FAQSection /> */}
-      {/* <TestimonialSection /> */}
-      {/* <CTASection />
-      <Footer /> */}
-
-      <style jsx>{`
-        @keyframes pulse {
-          0% {
-            opacity: 0.5;
-          }
-          50% {
-            opacity: 1;
-          }
-          100% {
-            opacity: 0.5;
-          }
-        }
-      `}</style>
     </div>
   );
 }