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
1ab792a.

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