summaryrefslogtreecommitdiffhomepage
path: root/zh-cn/java-cn.html.markdown
diff options
context:
space:
mode:
authorLari Kovanen <lari@kovanen.se>2015-12-09 13:25:01 +0100
committerLari Kovanen <lari@kovanen.se>2015-12-09 13:25:01 +0100
commit46d3c28a5fc341f3b8ef061e963adfc7c610263e (patch)
tree794df6f192a3875dc09d2710395048c5f405a806 /zh-cn/java-cn.html.markdown
parentdbfb19bb5779e84add18a19ebc36833e748e69d9 (diff)
parent1f76b2ad8c35b6c7e8ac2cc5dac8f20bc74f09ef (diff)
Merge remote-tracking branch 'adambard/master'
Diffstat (limited to 'zh-cn/java-cn.html.markdown')
-rw-r--r--zh-cn/java-cn.html.markdown2
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)