From 171c5f9f30775ee8117f17c06029854b3fc524e8 Mon Sep 17 00:00:00 2001 From: "EMMANUEL\\Emmanuel" Date: Wed, 25 Sep 2024 14:22:33 +0800 Subject: [PATCH 1/4] Add emmannyyy to AboutUs.md --- docs/AboutUs.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 8cf4ab68e9e..c0e080982df 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -59,3 +59,12 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` * Role: Developer * Responsibilities: UI + +### Emmanuel Er + + +[[github](http://github.com/emmannyyy)] +* Role: Team Lead +* Responsibilities: Git Expert, Manages Storage Component + + From 49c034418ebcd8a48b77b9c397e6c68ddc112dce Mon Sep 17 00:00:00 2001 From: "EMMANUEL\\Emmanuel" Date: Wed, 25 Sep 2024 14:46:44 +0800 Subject: [PATCH 2/4] no message --- docs/AboutUs.md | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index cfb2615952e..9952ba64552 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -1,10 +1,4 @@ ---- - layout: default.md - title: "About Us" ---- - # About Us - We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg). You can reach us at the email `seer[at]comp.nus.edu.sg` @@ -19,37 +13,12 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[portfolio](team/jian7490.md)] * Role: Developer -<<<<<<< HEAD -* Responsibilities: Data - -### Jean Doe - - - -[[github](http://github.com/johndoe)] -[[portfolio](team/johndoe.md)] - -* Role: Developer -* Responsibilities: Dev Ops + Threading - -### James Doe - - - -[[github](http://github.com/johndoe)] -[[portfolio](team/johndoe.md)] +* Responsibilities: Models + Code quality -* Role: Developer -* Responsibilities: UI ### Emmanuel Er [[github](http://github.com/emmannyyy)] * Role: Team Lead -* Responsibilities: Git Expert, Manages Storage Component - - -======= -* Responsibilities: Models + Code quality ->>>>>>> aaa074c28fb2329e80faa02e30d0b48716ad0121 +* Responsibilities: Git Expert, Manages Storage Component \ No newline at end of file From c417282c4379af22f3c7fde115e57880387a8735 Mon Sep 17 00:00:00 2001 From: "EMMANUEL\\Emmanuel" Date: Wed, 25 Sep 2024 14:47:49 +0800 Subject: [PATCH 3/4] Update code to meet checkstyle requirements --- docs/AboutUs.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 9952ba64552..0e6935bc4a8 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -21,4 +21,5 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](http://github.com/emmannyyy)] * Role: Team Lead -* Responsibilities: Git Expert, Manages Storage Component \ No newline at end of file +* Responsibilities: Git Expert, Manages Storage Component +* \ No newline at end of file From d68d5dd654263536d953f63dd9d7f9a3d34d5176 Mon Sep 17 00:00:00 2001 From: "EMMANUEL\\Emmanuel" Date: Wed, 25 Sep 2024 14:50:20 +0800 Subject: [PATCH 4/4] Update code to meet checkstyle requirements --- docs/AboutUs.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/AboutUs.md b/docs/AboutUs.md index 0e6935bc4a8..fb9b18f35cc 100644 --- a/docs/AboutUs.md +++ b/docs/AboutUs.md @@ -22,4 +22,3 @@ You can reach us at the email `seer[at]comp.nus.edu.sg` [[github](http://github.com/emmannyyy)] * Role: Team Lead * Responsibilities: Git Expert, Manages Storage Component -* \ No newline at end of file