Merge branch 'out_double' into new_branch · 2de33655a9 - test - Xinje

Merge branch 'out_double' into new_branch

# Conflicts:
#	hello.c

new_branch

wangxinyu 5 days ago

parent

4a3b6d324d fae2aa2f2b

commit

2de33655a9

1 changed files with 1 additions and 0 deletions

Split View

							
								+ 1
								
								- 0
							
hello.cView File
								
			@@ -11,5 +11,6 @@ void main()
		
			    printf("haode\n");
		
			    printf("制造冲突\n");
		
			    printf("添加新内容\n");
		
			    return 0;    
		
			}