Merge branch 'master' of https://github.com/CyC2018/InterviewNotes

2018-04-18 13:49:15 +08:00
parent 089dfb1d86 d1687d819f
commit 6942cf0cf4
5 changed files with 6 additions and 2 deletions
--- a/notes/剑指
+++ b/notes/剑指
@ -102,7 +102,11 @@
 position-0 : (2,3,1,0,2,5) // 2 <-> 1
             (1,3,2,0,2,5) // 1 <-> 3
             (3,1,2,0,2,5) // 3 <-> 0
+<<<<<<< HEAD
             (0,1,2,3,2,5) // already in position
+=======
+             (0,1,2,3,2,5) // already in position
+>>>>>>> d1687d819fdd50d1b3323cfb327b355e2b5eca35
 position-1 : (0,1,2,3,2,5) // already in position
 position-2 : (0,1,2,3,2,5) // already in position
 position-3 : (0,1,2,3,2,5) // already in position