4 年之前 · c9731a87b5
--- a/1.html
+++ b/1.html
@@ -1 +1,5 @@
 
				-Does she love me?
			
 
				+<<<<<<< HEAD
			
 
				+Does she love me?
			
 
				+=======
			
 
				+Welcome home <3
			
 
				+>>>>>>> master
			
--- a/4.txt
+++ b/4.txt
@@ -1 +1,5 @@
 
				-5623474
			
 
				+<<<<<<< HEAD
			
 
				+5623474
			
 
				+=======
			
 
				+fs
			
 
				+>>>>>>> master