diff options
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 3d0dfb6a7..52192ebdc 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5242,11 +5242,7 @@ ACMD(storeall) if (sd->status.inventory[i].amount) { if(sd->status.inventory[i].equip != 0) pc->unequipitem(sd, i, 3); -<<<<<<< HEAD - storage_storageadd(sd, i, sd->status.inventory[i].amount); -======= storage->add(sd, i, sd->status.inventory[i].amount); ->>>>>>> upstream/master } } storage->close(sd); |