Update reviewers in welcome.mdx and zero_shot_computer_vision.mdx

seshupavan · Mar 15, 2024 · 4bdfc5f · 4bdfc5f
1 parent bd05e39
commit 4bdfc5f
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/chapters/en/Unit 0 - Welcome/welcome.mdx b/chapters/en/Unit 0 - Welcome/welcome.mdx
@@ -108,11 +108,7 @@ Our goal was to create a computer vision course that is beginner-friendly and th
 
 **Unit 2 - Convolutional Neural Networks (CNNs)**
 
-<<<<<<< HEAD
-- Reviewers: [Mohammed Hamdy](https://github.com/mmhamdy), [Sezan](https://github.com/sezan92), [Joshua Adrian Cahyono](https://github.com/JvThunder), [Murtaza Nazir](https://github.com/themurtazanazir), [Albert Kao](https://github.com/albertkao227), [Sitam Meur](https://github.com/sitamgithub-MSIT), [Antonis Stellas](https://github.com/AntonisCSt)
-=======
-- Reviewers: [Ratan Prasad](https://github.com/ratan), [Mohammed Hamdy](https://github.com/mmhamdy), [Sezan](https://github.com/sezan92), [Joshua Adrian Cahyono](https://github.com/JvThunder), [Murtaza Nazir](https://github.com/themurtazanazir), [Albert Kao](https://github.com/albertkao227), [Sitam Meur](https://github.com/sitamgithub-MSIT)
->>>>>>> 60f20c76d56bb7d441cb185e16383998316ad229
+- Reviewers: [Ratan Prasad](https://github.com/ratan), [Mohammed Hamdy](https://github.com/mmhamdy), [Sezan](https://github.com/sezan92), [Joshua Adrian Cahyono](https://github.com/JvThunder), [Murtaza Nazir](https://github.com/themurtazanazir), [Albert Kao](https://github.com/albertkao227), [Sitam Meur](https://github.com/sitamgithub-MSIT), [Antonis Stellas](https://github.com/AntonisCSt)
 - Writers: [Emre Albayrak](https://github.com/emre570), [Caroline Shamiso Chitongo](https://github.com/ShamieCC), [Sezan](https://github.com/sezan92), [Joshua Adrian Cahyono](https://github.com/JvThunder), [Murtaza Nazir](https://github.com/themurtazanazir), [Albert Kao](https://github.com/albertkao227), [Isabella Bicalho-Frazeto](https://github.com/bellabf), [Aman Kapoor](https://github.com/aman06012003), [Sitam Meur](https://github.com/sitamgithub-MSIT)
 
 **Unit 3 - Vision Transformers**
@@ -158,11 +154,7 @@ Our goal was to create a computer vision course that is beginner-friendly and th
 
 **Unit 11 - Zero Shot Computer Vision**
 
-<<<<<<< HEAD
-- Reviewers: [Mohammed Hamdy](https://github.com/mmhamdy), [Albert Kao](https://github.com/albertkao227), [Isabella Bicalho-Frazeto](https://github.com/bellabf)
-=======
-- Reviewers: [Ratan Prasad](https://github.com/ratan), [Mohammed Hamdy](https://github.com/mmhamdy), [Albert Kao](https://github.com/albertkao227)
->>>>>>> 60f20c76d56bb7d441cb185e16383998316ad229
+- Reviewers: [Ratan Prasad](https://github.com/ratan), [Mohammed Hamdy](https://github.com/mmhamdy), [Albert Kao](https://github.com/albertkao227), [Isabella Bicalho-Frazeto](https://github.com/bellabf)
 - Writers: [Mohammed Hamdy](https://github.com/mmhamdy), [Albert Kao](https://github.com/albertkao227)
 
 **Unit 12 - Ethics and Biases in Audio and Computer Vision**