more conflicts

Author: titerman

src/components/Homepage.css

@@ -134,11 +134,7 @@
 
 .action-cards-grid {
   display: grid;
-<<<<<<< HEAD
-  grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
-=======
   grid-template-columns: repeat(2, 1fr);
->>>>>>> ADP-5307
   gap: 1rem;
 }
 
@@ -216,11 +212,7 @@
 
 .platform-cards-grid {
   display: grid;
-<<<<<<< HEAD
-  grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
-=======
   grid-template-columns: repeat(2, 1fr);
->>>>>>> ADP-5307
   gap: 1rem;
 }
 
@@ -298,9 +290,6 @@
 
   .action-cards-grid,
   .platform-cards-grid {
-<<<<<<< HEAD
-    grid-template-columns: 1fr;
-=======
     grid-template-columns: repeat(2, 1fr);
   }
 
@@ -314,7 +303,6 @@
 
   .platform-card-arrow {
     display: none;
->>>>>>> ADP-5307
   }
 
   .primary-card {
@@ -353,8 +341,4 @@
 .dark .action-card-title,
 .dark .platform-card-title {
   color: #f1f5f9;
-<<<<<<< HEAD
-}
-=======
 }
->>>>>>> ADP-5307

src/components/Homepage.tsx

@@ -74,11 +74,7 @@ const Homepage: React.FC = () => {
               </svg>
             </div>
             <div className="action-card-content">
-<<<<<<< HEAD
-              <h3 className="action-card-title">Explore revenue & churn analytics</h3>
-=======
               <h3 className="action-card-title">Explore analytics</h3>
->>>>>>> ADP-5307
               <p className="action-card-description">
                 Review detailed metrics related to your app monetization.
               </p>