Update Companies.jsx

Resilient-Labs · Jan 9, 2025 · 230bbe3 · 230bbe3
1 parent 6096cca
commit 230bbe3
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/src/pages/Companies/Companies.jsx b/src/pages/Companies/Companies.jsx
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import './companies.css'
 import CompanyListing from '../../components/CompanyListing/CompanyListing.jsx'
 
@@ -12,18 +11,3 @@ const Companies = () => {
 }
 
 export default Companies
-=======
-import './companies.css'
-import CompanyListing from '../../components/CompanyListing/CompanyListing.jsx'
-
-const Companies = () => {
-    return (
-        <main className="companies-container">
-            <h1 className="page-title">Popular Companies</h1>
-            <CompanyListing />
-        </main>
-    )
-}
-
-export default Companies
->>>>>>> fa5ac3f743b18acfeda505df07467e6622754c42