From 0ed305fd5a5ed6d5e97ce1f9bccdaf98e4bc8abd Mon Sep 17 00:00:00 2001 From: jiang wei Date: Tue, 14 Mar 2023 17:51:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/portrait' into portrait --- src/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test.txt b/src/test.txt index 5489a9dc..9c19e5fc 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -merge ide +Merge remote-tracking branch 'origin/portrait' into portrait