diff options
| author | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
|---|---|---|
| committer | Euphy <euphy@rathena.org> | 2013-06-20 22:46:37 -0400 |
| commit | 093193bd26b87f6afc876fd96b46271bd4e2ed81 (patch) | |
| tree | e52e626bc8edc9ea68eb48ad2e8ec517ee997d33 /src/map/map.c | |
| parent | 86c43fa2e2c164362cae4f3c2d9cf0ccd22bc528 (diff) | |
| download | hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.gz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.bz2 hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.tar.xz hercules-093193bd26b87f6afc876fd96b46271bd4e2ed81.zip | |
Merged conflicts.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/map/map.c b/src/map/map.c index a030515d8..fbdb7a9f9 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5235,13 +5235,9 @@ void map_hp_symbols(void) { HPM->share(buyingstore,"buyingstore"); HPM->share(clif,"clif"); HPM->share(guild,"guild"); -<<<<<<< HEAD - HPM->share(homun,"homun"); -======= HPM->share(gstorage,"gstorage"); HPM->share(homun,"homun"); HPM->share(iMap,"iMap"); ->>>>>>> upstream/master HPM->share(ircbot,"ircbot"); HPM->share(itemdb,"itemdb"); HPM->share(logs,"logs"); @@ -5252,12 +5248,8 @@ void map_hp_symbols(void) { HPM->share(vending,"vending"); HPM->share(pc,"pc"); HPM->share(party,"party"); -<<<<<<< HEAD - HPM->share(iMap,"iMap"); -======= HPM->share(storage,"storage"); HPM->share(trade,"trade"); ->>>>>>> upstream/master /* partial */ HPM->share(mapit,"mapit"); /* sql link */ @@ -5290,11 +5282,8 @@ void load_defaults(void) { vending_defaults(); pc_defaults(); party_defaults(); -<<<<<<< HEAD -======= storage_defaults(); trade_defaults(); ->>>>>>> upstream/master } int do_init(int argc, char *argv[]) { |