bug #12382 [Routing] removed errors from git (HeinZawHtet)
This PR was submitted for the master branch but it was merged into the 2.5 branch instead (closes #12382).
Discussion
----------
[Routing] removed errors from git
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #12387
| License | MIT
| Doc PR | -
Commits
-------
2492dab
removed errors from git
This commit is contained in:
commit
318ad052d2
@ -130,13 +130,11 @@ class Route implements \Serializable
|
||||
$this->options = $data['options'];
|
||||
$this->schemes = $data['schemes'];
|
||||
$this->methods = $data['methods'];
|
||||
<<<<<<< HEAD
|
||||
$this->condition = $data['condition'];
|
||||
=======
|
||||
|
||||
if (isset($data['compiled'])) {
|
||||
$this->compiled = $data['compiled'];
|
||||
}
|
||||
>>>>>>> 2.3
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user