Manual merge

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index a835346db341b62c297c6f999247e561e9e570c6..66518ac76861fff4d34a41078e89fa690631100d 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -7,12 +7,16 @@
   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
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -77,7 +81,7 @@ private:
   void score_qcaptures();
   Move pick_move_from_list();
   int find_best_index();
-  
+
   const Position& pos;
   Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
@@ -101,6 +105,7 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
+
   return numOfMoves;
 }