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

bakura10 · bakura10 · commit 62873668fe0c · 2016-03-22T13:46:45.000+01:00
Resolved conflict
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
 {

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,8 @@`
`27`	`27`	`* @method GuardInterface get($name)`
`28`	`28`	`*`
`29`	`29`	`* @author Michaël Gallego <mic.gallego@gmail.com>`
`30`		`-<<<<<<< b459677bbe1c328d819969eed3fe7df68cb1112b`
`31`	`30`	`* @author JM Leroux <jmleroux.pro@gmail.com>`
`32`	`31`	`* @license MIT`
`33`		`-=======`
`34`		`- * @license MIT`
`35`		`->>>>>>> changes "@license" with "@license"`
`36`	`32`	`*/`
`37`	`33`	`class GuardPluginManager extends AbstractPluginManager`
`38`	`34`	`{`