Un-revert change to ModuleEvent

- re-add EVENT_MERGE_CONFIG, per https://github.com/zendframework/zf2/blob/78eaad03cb25aa89e448beaad55cdbb6fe1227fc/library/Zend/ModuleManager/ModuleEvent.php#L23-L27
vicular · Aug 19, 2013 · 2c4f4e1 · 2c4f4e1
1 parent b0ae468
commit 2c4f4e1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/library/Zend/ModuleManager/ModuleEvent.php b/library/Zend/ModuleManager/ModuleEvent.php
@@ -20,6 +20,7 @@ class ModuleEvent extends Event
     /**
      * Module events triggered by eventmanager
      */
+    CONST EVENT_MERGE_CONFIG        = 'mergeConfig';
     CONST EVENT_LOAD_MODULES        = 'loadModules';
     CONST EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve';
     CONST EVENT_LOAD_MODULE         = 'loadModule';