Resolve merge conflicts for src/pages/team.js

create-se4ai · Nov 26, 2024 · 36c0cf2 · 36c0cf2
1 parent 621ceac
commit 36c0cf2
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/src/pages/team.js b/src/pages/team.js
@@ -258,19 +258,14 @@ const TeamMemberList = [
       {
         name: "Khaled Badran",
         degree:", MSc",
-<<<<<<< HEAD
         place:"Alraqamia",
         position:"Currently Lead AI Engineer",
         // link:"https://sycodal.ca/fr/",
         // place:"Alraqmyia"
-=======
-        place:"Alraqmyia"
-        position:"Lead AI Engineer"
->>>>>>> 7fce4c1c9f90c8296f8aeea7a9c885a74757d4af
         twitter: "khaled_badran9",
         linkedin: "khaled-badran-6b0908174",
         //affilitaion: "Concordia"
-      },
+      }, 
       {
         name: "Rached Bouchoucha",
         degree:", MSc",