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/script.c | 3 ---
 1 file changed, 3 deletions(-)

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

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