Manual merge

This commit is contained in:
Marco Costalba
2008-10-26 21:44:58 +01:00
6 changed files with 44 additions and 37 deletions

View File

@@ -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