Merge remote-tracking branch 'origin/master'

# Conflicts: # code/home
Merge remote-tracking branch 'origin/master' into master
2 changed files with 2 additions and 1 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,2 @@
 hahaha
-get from version control...
+get from version control
Author	SHA1	Message	Date
wwgomuzyj	3c8e0ee94b	Merge remote-tracking branch 'origin/master' # Conflicts: # code/home	3 years ago
wang	b5f0daccd8	Merge remote-tracking branch 'origin/master' into master	3 years ago