From b5f0daccd857273b649cc5f4dd8ac3b8b0bc16e1 Mon Sep 17 00:00:00 2001 From: wang <1934065580@qq.com> Date: Mon, 8 Nov 2021 15:25:59 +0800 Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/master' into master --- .idea/vcs.xml | 1 + code/home | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/code/home b/code/home index 9ce7fea..e7b9bb8 100644 --- a/code/home +++ b/code/home @@ -1,2 +1 @@ -hahaha -get from version control \ No newline at end of file +jjsb \ No newline at end of file From 483769d36454d6a8037559e8306157a026dfa2d9 Mon Sep 17 00:00:00 2001 From: wang <1934065580@qq.com> Date: Mon, 8 Nov 2021 15:25:59 +0800 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/master' into master --- code/home | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/home b/code/home index 9ce7fea..837a890 100644 --- a/code/home +++ b/code/home @@ -1,2 +1,2 @@ -hahaha +hahahaha get from version control \ No newline at end of file