Merge pull request #329 from grizzm0/hotfix/conflict-message

Resolved conflict
ZF-Commons · Mar 22, 2016 · 6287366 · 6287366
2 parents 4a8fe9a + 49d73ad
commit 6287366
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/ZfcRbac/Guard/GuardPluginManager.php b/src/ZfcRbac/Guard/GuardPluginManager.php
@@ -27,12 +27,8 @@
  * @method GuardInterface get($name)
  *
  * @author  Michaël Gallego <mic.gallego@gmail.com>
-<<<<<<< b459677bbe1c328d819969eed3fe7df68cb1112b
  * @author  JM Leroux <jmleroux.pro@gmail.com>
  * @license MIT
-=======
- * @license MIT
->>>>>>> changes "@license" with "@license"
  */
 class GuardPluginManager extends AbstractPluginManager
 {