Merge branch 'master' of https://github.com/linyongji/Alogrithm_git

# Conflicts:
#	.gitignore

.gitignore

@@ -95,10 +95,12 @@ Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/b7e343aeb2d15224/4_ISPALINDROME.ipch
 Alogrithm/Alogrithm/Debug/4_IsPalindrome.obj
 Alogrithm/TestResults/6fafde8c-d7b3-4676-8e54-90b128e5f315/林_MI-1 2021-01-15 09_25_22.coverage
 Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/2fc14b893d0d0c4d/5_MINDEPTH.ipch
-Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/3074205571b356e6/6_CONTAINSDUPLICATE.ipch
 Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/481f9764231e57bf/4_ISPALINDROME.ipch
 Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/76af66dca66611c4/5_MINDEPTH.ipch
-Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/ab4a44a8d749bee1/6_CONTAINSDUPLICATE.ipch
 Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/caf245688b80a979/5_MINDEPTH.ipch
-Alogrithm/Alogrithm/config/6_ContainsDuplicate.ini.rej
+Alogrithm/Alogrithm/Debug/5_MinDepth.obj
+Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/3074205571b356e6/6_CONTAINSDUPLICATE.ipch
+Alogrithm/.vs/Alogrithm/v16/ipch/AutoPCH/ab4a44a8d749bee1/6_CONTAINSDUPLICATE.ipch
+>>>>>>> 71fa9786fe524fa393358479cab8105f9239c68c
 Alogrithm/Alogrithm/Debug/6_ContainsDuplicate.obj
+Alogrithm/Alogrithm/config/6_ContainsDuplicate.ini.rej