fixed bad merge

fabpot · fabpot · commit be09e068c0f5 · 2011-11-23T11:32:47.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -949,24 +949,6 @@ public function setRequestFormat($format)
         $this->format = $format;
     }
 
-    public function setLocale($locale)
-    {
-        if (!$this->hasSession()) {
-            throw new \LogicException('Forward compatibility for Request::setLocale() requires the session to be set.');
-        }
-
-        $this->session->setLocale($locale);
-    }
-
-    public function getLocale()
-    {
-        if (!$this->hasSession()) {
-            throw new \LogicException('Forward compatibility for Request::getLocale() requires the session to be set.');
-        }
-
-        return $this->session->getLocale();
-    }
-
     /**
      * Gets the format associated with the request.
      *
