From d36ecf8d732e49132e4aca59a797efc8add45f53 Mon Sep 17 00:00:00 2001
From: Bob Blackmon <bob.blackmon@ymail.com>
Date: Mon, 3 Apr 2017 10:49:27 -0400
Subject: Changed hook to merge

---
 lua/zones.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua')

diff --git a/lua/zones.lua b/lua/zones.lua
index 876131e..23b2aca 100644
--- a/lua/zones.lua
+++ b/lua/zones.lua
@@ -282,7 +282,7 @@ if SERVER then
 		
 		zones.Remove(from)
 		
-		hook.Run("OnZoneChanged",zto,zto.class,to)
+		hook.Run("OnZoneMerged",zto,zto.class,to,zfrom,zfrom.class,from)
 		
 		zones.Sync()
 		
-- 
cgit v1.2.3-70-g09d2