1 年之前 · c5eaaf875e
--- a/HomeWork4/index.html
+++ b/HomeWork4/index.html
@@ -232,9 +232,12 @@
 
				         str += "</table>"
			
 
				         document.write(str)
			
 
				 
			
 
				+<<<<<<< HEAD
			
 
				 
			
 
				+     
			
 
				+>>>>>>> 66c645a94ee8e13795977b18839efda21361f62e
			
 
				     
			
 
				-            ///////////
			
 
				+            ///////////////////
			
 
				 
			
 
				 
			
 
				     </script>