Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 2 insertions, 1 deletions

diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt
index 778f2d9b..0bf5d7e1 100644
--- a/world/map/npc/015-1/barrier.txt
+++ b/world/map/npc/015-1/barrier.txt
@@ -1,7 +1,8 @@
 // This barrier is for checking whether the player went outside after
 // progressing with the cat quest.
 
-015-1.gat,59,32,0|script|#CatOutsideBarrier|0,1,1,{
+015-1.gat,59,32,0|script|#CatOutsideBarrier|0,1,1,
+{
     set @catNeedsAlone, 0;
     end;
 }