Revert "Merge branch 'main' into new-try"

This reverts commit 20ab2d9, reversing changes made to aaaaab8.
fgrana · Oct 21, 2024 · e1e9887 · e1e9887
1 parent a7591fa
commit e1e9887
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/pages/Projects.tsx b/src/pages/Projects.tsx
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 import Footer from "../containers/Footer";
 
-=======
-import Card from "./../containers/Card";
-import Footer from "../containers/Footer";
-
-const projects = ["pokemon"];
->>>>>>> main
 
 const Projects = () => {
   return (