Merge pull request nus-cs2113-AY2324S2#5 from yeozongyao/MAIN-master

Zong Yao Main master
yeozongyao · Mar 8, 2024 · 411536d · 411536d
2 parents 60bebe2 + 1e71bf2
commit 411536d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -9,3 +9,8 @@ Display |  Name   |             Github Profile              | Portfolio
 
 
 
+=======
+Display |   Name   | Github Profile | Portfolio 
+--------|:--------:|:--------------:|:---------:
+![](https://via.placeholder.com/100.png?text=Photo) | Zong Yao | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+>>>>>>> master