From 093193bd26b87f6afc876fd96b46271bd4e2ed81 Mon Sep 17 00:00:00 2001
From: Euphy <euphy@rathena.org>
Date: Thu, 20 Jun 2013 22:46:37 -0400
Subject: Merged conflicts.

---
 src/map/atcommand.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/map/atcommand.c')

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);
-- 
cgit v1.2.3-70-g09d2