Merge remote-tracking branch 'origin/master' into master

3 years ago · b5f0daccd8
parent bc54401757
commit b5f0daccd8
2 changed files with 2 additions and 2 deletions
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -2,5 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$" vcs="Git" />
  </component>
 </project>
--- a/code/home
+++ b/code/home
@ -1,2 +1 @@
-hahaha
+jjsb
 get from version control