Fix bad merge
commit6164c7f44cebee431785584f1aa181cdb8ef2e84
authorNuno <ulukyn@gmail.com>
Mon, 15 May 2023 15:21:28 +0000 (15 17:21 +0200)
committerNuno <ulukyn@gmail.com>
Mon, 15 May 2023 15:21:28 +0000 (15 17:21 +0200)
tree0386e52944966a90e29ff5923e0bb2b1dcb82a02
parentdb7bf790457cabf3e4ac3167307051aabd725da3
Fix bad merge
ryzom/server/src/entities_game_service/game_item_manager/player_inv_equip.cpp