Merge branch '44' of http://gitea.xinje.cc/linkanggui/d into 44

# Conflicts:
#	3.txt

3.txt

@@ -1,5 +1,9 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 1111
 =======
 3333
 >>>>>>> 8dcf2c2 (3)
+=======
+3333
+>>>>>>> 8dcf2c2479058f8f67e78eaacb7cc01e561df70d