removed errors from git
This commit is contained in:
parent
14c417a391
commit
2492dab747
@ -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