From d502e32cb5cb3b59f3b1c077151976e4c5ef5e80 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 19 Sep 2013 12:35:49 +0200
Subject: [PATCH] fixed Git conflict

---
 src/Symfony/Component/Locale/Locale.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Symfony/Component/Locale/Locale.php b/src/Symfony/Component/Locale/Locale.php
index 14dd2940a7..109ae204fc 100644
--- a/src/Symfony/Component/Locale/Locale.php
+++ b/src/Symfony/Component/Locale/Locale.php
@@ -94,11 +94,8 @@ class Locale extends \Locale
      * Returns all available language codes
      *
      * @return array              The language codes
-<<<<<<< HEAD
+     *
      * @throws \RuntimeException  When the resource bundles cannot be loaded
-=======
-     * @throws \RuntimeException   When the resource bundles cannot be loaded
->>>>>>> 2.2
      */
     public static function getLanguages()
     {
@@ -127,11 +124,8 @@ class Locale extends \Locale
      * Returns all available locale codes
      *
      * @return array              The locale codes
-<<<<<<< HEAD
+     *
      * @throws \RuntimeException  When the resource bundles cannot be loaded
-=======
-     * @throws \RuntimeException   When the resource bundles cannot be loaded
->>>>>>> 2.2
      */
     public static function getLocales()
     {
@@ -182,14 +176,9 @@ class Locale extends \Locale
     /**
      * Returns the fallback locale for a given locale, if any
      *
-<<<<<<< HEAD
      * @param string $locale The locale to find the fallback for.
      *
      * @return string|null The fallback locale, or null if no parent exists
-=======
-     * @param string $locale      The locale to find the fallback for
-     * @return string|null        The fallback locale, or null if no parent exists
->>>>>>> 2.2
      */
     protected static function getFallbackLocale($locale)
     {