Merge remote-tracking branch 'origin/master'

3 years ago · 703acc30cf
parent 60ddac5cc1 181345e77e
commit 703acc30cf
2 changed files with 2 additions and 1 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/doc/test2.md
+++ b/doc/test2.md
@ -0,0 +1 @@
+我是shab