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

# Conflicts: # code/home
3 years ago · 6d99e3ee1b
parent 4c63f31d66 483769d364
commit 6d99e3ee1b
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 @@
-hahahahahaha
+hahaha
 get from version control...