diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3'

Browse Source 
* 2.3:
  fixed Git conflict
This commit is contained in:
Fabien Potencier 2013-09-19 12:37:07 +02:00
commit 8d6131f7f4
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Symfony/Component/Locale/Locale.php
View File

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