Merge branch 'master' of git.linkerplus.com:houyt/cjl · ce8c5d2409 - AMTXTS

Merge branch 'master' of git.linkerplus.com:houyt/cjl

# Conflicts:
#	new.txt

huangc 7 years ago

parent

f6708ec9c0 4956c294bb

commit

ce8c5d2409

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
new.txt
							 
								View File
							
				@@ -1,6 +1,7 @@
			
				 <body>
			
				 <html>
			
				   <p >hello world <p>
			
				+  <h2> this is a new world!</h2>
			
				   <h1> this is a new world! ok I know it</h1>
			
				 </html>
			
				 </body>