# Conflicts: # src/saveload/cargopacket_sl.cpp # src/saveload/saveload.h # src/strings.cpp # src/vehicle.cpp
2.1 KiB
2.1 KiB
# Conflicts: # src/saveload/cargopacket_sl.cpp # src/saveload/saveload.h # src/strings.cpp # src/vehicle.cpp