From 3b71e02577bf6951dc64b191dde2cee58940b716 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 30 Dec 2015 00:46:50 +0100 Subject: [PATCH] Merge with develop --- .../src/entities_game_service/entity_structure/resists.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp index 89322cc9f..b8f195857 100644 --- a/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_structure/resists.cpp @@ -22,8 +22,6 @@ #include "stdpch.h" // #include "resists.h" -#include "player_manager/character.h" -#include "game_item_manager/game_item.h" ////////////// // USING //