# Conflicts: # conf/battle/feature.conf # src/map/battle.cpp # src/map/battle.hpp # src/map/clif.cpp # src/map/clif.hpp # src/map/packets.hpp
# Conflicts: # conf/battle/feature.conf # src/map/battle.cpp # src/map/battle.hpp # src/map/clif.cpp # src/map/clif.hpp # src/map/packets.hpp