Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[W5.1b] Merging conflicting PR #20

Closed
wants to merge 10 commits into from
Closed

[W5.1b] Merging conflicting PR #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0d6e69
added resume
justintkj Sep 9, 2017
77790db
Added GleniceTanYuXin.md to the repo.
blackroxs Sep 12, 2017
c771580
README.md: Added GleniceTanYuXin details.
blackroxs Sep 12, 2017
3758d1d
Removes John Doe and Jane Doe
Sep 14, 2017
141d4e1
conflicting PR
justintkj Sep 14, 2017
e3445fc
Merge branch 'master' into w5.1b
justintkj Sep 14, 2017
87369d2
Merge branch 'master' into AddMember
blackroxs Sep 14, 2017
fb1e574
Merge pull request #4 from CS2103-F09-A1/AddMember
blackroxs Sep 14, 2017
49cc595
Merge branch 'master' into w5.1b
justintkj Sep 14, 2017
749a7a2
moved JustinTanKunJie to members
justintkj Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TEAM ID
This is a team repo for members of the team {Team ID}
This is a team repo for members of the team {F09-A1}

# Team Members
* [Jane Doe](members/janeDoe.md)
* [John Doe](members/johnDoe.md)
* [Justin](members/JustinTanKunJie.md)
* [Glenice Tan Yu Xin](members/GleniceTanYuXin.md)
10 changes: 10 additions & 0 deletions members/GleniceTanYuXin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Glenice Tan Yu Xin

## Education

## Work Experience

* [3 months: 2017 May - July] Sofware Engineering Intern, at CSA

## Hobby
* [Inline Skating]
5 changes: 5 additions & 0 deletions members/JustinTanKunJie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
RESUME
Name: Justin Tan Kun Jie
Module: CS2103
Exercise: W5.1b
Team: F09-A1