Fixed a few more merge errors

nashvillefcc · Sep 3, 2021 · 3b9b9a0 · 3b9b9a0
1 parent 4a79b7f
commit 3b9b9a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/css/style.css b/src/css/style.css
@@ -6,12 +6,11 @@
 /*! purgecss end ignore */
 @tailwind utilities;
 
-.main-section {
-  @apply w-full pt-20 pb-32;
+.mainSection {
+  @apply w-full py-20;
 }
 
-.main-section-content,
-.connect-logo-container {
+.mainSectionContent {
   @apply w-full max-w-6xl px-4 mx-auto;
 }
 

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -76,17 +76,9 @@ function IndexPage() {
         </h2>
       </section>
 
-<<<<<<< HEAD
       <section className="mainSection">
-        <div className="mainSectionContent md:max-w-full md:px-12">
-          <div className="px-8 grid gap-12 md:grid-cols-3 md:p-0">
-=======
-      <section className="main-section">
-        <div className="main-section-content">
-          <div
-            className={`px-8 grid gap-12 md:grid-cols-3 justify-center  md:p-0`}
-          >
->>>>>>> afaad19... Made some changes to address suggested changes from Pete's review
+        <div className="mainSectionContent">
+          <div className="px-8 grid gap-12 md:grid-cols-3 justify-center md:p-0">
             {upcomingEvents.length > 0 ? (
               upcomingEvents.map(e => {
                 return <EventCard key={e.id} event={e} />;