From ed530a42d1f94d385f98a18a4dcc699ee1efcd45 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 4 Jun 2015 16:32:18 +0800
Subject: [PATCH] DataObjects/Core_enum.php

---
 DataObjects/Core_enum.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 7c0a3bcb..2c3388bd 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -338,5 +338,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
+    function merge($id)
+    {
+        
+    }
+    
     
 }
-- 
2.39.2