From be719ba777824dc019a013cb877b8eaccd13208c Mon Sep 17 00:00:00 2001 From: Evan Coury Date: Sun, 18 Aug 2013 12:14:47 -0700 Subject: [PATCH] Quick fix for my previous merge commit I guess I didn't :w in vim with the conflict before running the `git-add`. Anyway, this is the merge conflict resolution for 1ab792a9ee9d. --- library/Zend/ModuleManager/ModuleEvent.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/library/Zend/ModuleManager/ModuleEvent.php b/library/Zend/ModuleManager/ModuleEvent.php index 0b91eda579d..c19b9976322 100644 --- a/library/Zend/ModuleManager/ModuleEvent.php +++ b/library/Zend/ModuleManager/ModuleEvent.php @@ -20,18 +20,11 @@ class ModuleEvent extends Event /** * Module events triggered by eventmanager */ -<<<<<<< HEAD - CONST EVENT_MERGE_CONFIG = 'mergeConfig'; - CONST EVENT_LOAD_MODULES = 'loadModules'; - CONST EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve'; - CONST EVENT_LOAD_MODULE = 'loadModule'; - CONST EVENT_LOAD_MODULES_POST = 'loadModules.post'; -======= + const EVENT_MERGE_CONFIG = 'mergeConfig'; const EVENT_LOAD_MODULES = 'loadModules'; const EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve'; const EVENT_LOAD_MODULE = 'loadModule'; const EVENT_LOAD_MODULES_POST = 'loadModules.post'; ->>>>>>> FETCH_HEAD /** * @var mixed