X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;fp=src%2Fmovepick.h;h=66518ac76861fff4d34a41078e89fa690631100d;hp=b48bd8b80bd528e8cff46fef072f13965d88524d;hb=74f1efee263aadcceb1df716ebd87776b932238a;hpb=0936a96a0e0cc7283ee6b1915f47c01e5756c32e

diff --git a/src/movepick.h b/src/movepick.h
index b48bd8b8..66518ac7 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -7,7 +7,11 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
+<<<<<<< HEAD:src/movepick.h
 
+=======
+  
+>>>>>>> d3600c39a745179ed6b094b305d0645e83a1ee86:src/movepick.h
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the