diff options
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c index 4876111ef..f65c0c21c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -16310,10 +16310,7 @@ BUILDIN(progressbar) sd->progressbar.npc_id = st->oid; sd->progressbar.timeout = iTimer->gettick() + second*1000; -<<<<<<< HEAD -======= sd->state.workinprogress = 3; ->>>>>>> upstream/master clif->progressbar(sd, strtol(color, (char **)NULL, 0), second); return true; |