diff options
| author | Dennis Keller <dk.denniskeller@gmail.com> | 2015-10-31 11:11:06 +0100 |
|---|---|---|
| committer | Dennis Keller <dk.denniskeller@gmail.com> | 2015-10-31 11:11:06 +0100 |
| commit | ca6ea580c7df41730fe547b0c35b3406dc9e590f (patch) | |
| tree | 8f6daf20606ce1dd0e050c8b65ebcef452e20d0e /zh-cn/java-cn.html.markdown | |
| parent | 2c99b0a9553f25a7ac43b04a14c4e2d78fe2b318 (diff) | |
| parent | edfc99e198fd2e87802ea81d6779fbadfab64919 (diff) | |
Merge remote-tracking branch 'upstream/master' into scala/de
Diffstat (limited to 'zh-cn/java-cn.html.markdown')
| -rw-r--r-- | zh-cn/java-cn.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zh-cn/java-cn.html.markdown b/zh-cn/java-cn.html.markdown index 12afa59a..a8fd2a4c 100644 --- a/zh-cn/java-cn.html.markdown +++ b/zh-cn/java-cn.html.markdown @@ -405,4 +405,4 @@ class PennyFarthing extends Bicycle { * [泛型](http://docs.oracle.com/javase/tutorial/java/generics/index.html) -* [Java代码规范](http://www.oracle.com/technetwork/java/codeconv-138413.html) +* [Java代码规范](http://www.oracle.com/technetwork/java/codeconvtoc-136057.html) |