resolved merge conflict

chuanxshi · chuanxshi · commit dd26b8ec6d49 · 2018-06-10T23:01:02.000+08:00
diff --git a/general-patterns/parseint.html b/general-patterns/parseint.html
@@ -17,7 +17,7 @@
 			 //if we omit the radix parameter then the returned value is not zero, it takes base 10 in chrome console.please check
 
 			var month = "06",
-				year = "09";
+			year = "09";
 			month = parseInt(month, 10);
 			year = parseInt(year, 10);
 
