Merge remote-tracking branch 'remotes/origin/main' into branch_cwf

# Conflicts: # test.txt
1 year ago · 612c66f89e
parent 29a9fa2f22 4f20056302
commit 612c66f89e
1 changed files with 7 additions and 0 deletions
--- a/test.txt
+++ b/test.txt
@ -11,4 +11,11 @@ z1   z2   13131
 d11111
 d2
 d3
+<<<<<<< HEAD
 >>>>>>> remotes/origin/developer
+=======
+d4w
+d5
+d6
+d7
+>>>>>>> remotes/origin/main