Merge 7858dcb into caf11e4

CS2103-AY1819S1-W12-4 · Nov 14, 2018 · 840aaef · 840aaef
2 parents caf11e4 + 7858dcb
commit 840aaef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docs/AboutUs.adoc b/docs/AboutUs.adoc
@@ -41,8 +41,9 @@ Responsibilities: UI
 
 === Henry Jayakusuma
 
-image::HenryJk.png[width="150", align="left"]
-{empty}[http://github.com/HenryJk[github]]
+<<<<<<< HEAD
+image::henryjk.png[width="150", align="left"]
+{empty}[http://github.com/HenryJk[github]] [<<henryjk#, portfolio>>]
 
 Role: Developer +
 Responsibilities: Backend

diff --git a/docs/images/henryjk.png b/docs/images/henryjk.png
diff --git a/docs/team/HenryJk.adoc → docs/team/henryjk.adoc b/docs/team/HenryJk.adoc → docs/team/henryjk.adoc