Merge remote-tracking branch 'origin/master'

jquery · Sep 8, 2014 · 4392509 · 4392509
2 parents 79a3be5 + ef742a3
commit 4392509
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build/CCC.html b/build/CCC.html
@@ -2,7 +2,7 @@
 <html>
 <head lang="en">
     <meta charset="UTF-8">
-    <title>这是我的第一次测试</title>
+    <title>这是我的第一次测我先在的想法是制造冲突啊，哈哈</title>
 </head>
 <body>
 你能告诉我你在干什么吗？123