From 2492dab747c3159540a465bc03ac712f2a678459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hein=20Zaw=20Htet=E2=84=A2?= Date: Mon, 3 Nov 2014 13:01:47 +0630 Subject: [PATCH] removed errors from git --- src/Symfony/Component/Routing/Route.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index e4b6c5402f..8e5576bd26 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -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 } /**