auto commit

notes/剑指 offer 题解.md

@@ -102,11 +102,7 @@
 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