Merge branch 'dd' into sdas

# Conflicts: # main.js
4 years ago · 5ab5bbde98
1 changed files with 2 additions and 1 deletions
--- a/main.js
+++ b/main.js
@ -1 +1,2 @@
-console.log(阿斯顿萨达萨达);
+console.log(22131231);
 console.log(13213131);