iskm/learnxinyminutes-docs
1
0
Fork 0
mirror of https://github.com/adambard/learnxinyminutes-docs.git synced 2024-12-23 09:41:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve merge conflict with master

Browse Source 
+ added name back to contributor list
This commit is contained in:
Cameron Schermerhorn 2015-10-09 13:31:48 -04:00
parent d2010c0860
commit 35e89f86fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java.html.markdown
View File

@ -6,7 +6,7 @@ contributors:
- ["Madison Dickson", "http://github.com/mix3d"]
- ["Simon Morgan", "http://sjm.io/"]
- ["Zachary Ferguson", "http://github.com/zfergus2"]
- ["Cameron Schermerhorn", "http://github.com/cschermerhorn"]
- ["Cameron Schermerhorn", "http://github.com/cschermerhorn"]
filename: LearnJava.java
---