dinislage/global.hackathon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

font trouble

Browse Source
This commit is contained in:
phantomkirby
2014-11-25 23:16:54 +09:00
parent a86b5e6969
commit 37760b1942
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Teams/Gundam/ABOUT.md
View File

@@ -34,10 +34,7 @@ Cherry is an engineering student at the University of Waterloo, and has a lot of
Fan
=======
Fan is an ambitious engineer at the University of Waterloo, and has been doing front-end web development, and also recently back-end development as well (PHP and MySQL). He will be one of the engineers on this team. He also really likes Gundam. [Website](http://thefanzhang.com/)
<<<<<<< HEAD
Tommy
=======
Tommy just recently started app development and web development, and he has fallen in love with it. He is an engineer at the University of Waterloo, and has learned a lot of languages very quickly, including python, iOS development, html, css, and JavaScript.
=======
>>>>>>> 784175de43380cc1ae4cd1ad6cd4a07ed39bc008