Code

[W5.1b] Merging conflicting PR#20

Code

Closed

justintkj wants to merge 10 commits intose-edu:masterse-edu/samplerepo-workflow-practice:masterfrom justintkj:w5.1bjustintkj/samplerepo-workflow-practice:w5.1bCopy head branch name to clipboard

+18-3

Commits

Commits on Sep 9, 2017

• added resume

  justintkj

  committed
  f0d6e69

  Copy full SHA for f0d6e69

Commits on Sep 12, 2017

• Added GleniceTanYuXin.md to the repo.

  blackroxs

  committed
  77790db

  Copy full SHA for 77790db

• README.md: Added GleniceTanYuXin details.

  blackroxs

  committed
  c771580

  Copy full SHA for c771580

Commits on Sep 14, 2017

• Removes John Doe and Jane Doe

  Show description for 3758d1d
  

  Liu Hang

  authored
  3758d1d

  Copy full SHA for 3758d1d

• conflicting PR

  justintkj

  committed
  141d4e1

  Copy full SHA for 141d4e1

• Merge branch 'master' into w5.1b

  justintkj

  authored
  e3445fc

  Copy full SHA for e3445fc

• Merge branch 'master' into AddMember

  blackroxs

  authored
  87369d2

  Copy full SHA for 87369d2

• Merge pull request CS2103-F09-A1#4 from CS2103-F09-A1/AddMember

  Show description for fb1e574
  blackroxs

  authored
  fb1e574

  Copy full SHA for fb1e574

• Merge branch 'master' into w5.1b

  justintkj

  authored
  49cc595

  Copy full SHA for 49cc595

• moved JustinTanKunJie to members

  justintkj

  committed
  749a7a2

  Copy full SHA for 749a7a2