Projects >> messagesource >>4da434ac1f61de83a5b3b2a7622a4b5bab328b38

Chunk
Conflicting content 
 * 
  • given {@link Locale}s language + country + variant
    • 
 * 
  • given {@link Locale}s language + country
    • 
 * 
  • given {@link Locale}s language
    • 
<<<<<<< HEAD
 * 
  • default {@link Locale}s language + country + variant (property defaultLocale, if not null)
    • 
 * 
  • default {@link Locale}s language + country (property defaultLocale, if not null)
    • 
 * 
  • default {@link Locale}s language (property defaultLocale, if not null)
    • 
=======
 * 
  • default {@link Locale}s language + country + variant (property defaultLocale)
    •  
 * 
  • default {@link Locale}s language + country (property defaultLocale)
    • 
 * 
  • default {@link Locale}s language (property defaultLocale)
    • 
>>>>>>> c169cc88edc3fff82d351b37040b0acf58100c7a
 * 
  • Default (basename)
    • 
 * 
 *
    Solution content 
     * 
  • given {@link Locale}s language + country + variant
    • 
 * 
  • given {@link Locale}s language + country
    • 
 * 
  • given {@link Locale}s language
    • 
 * 
  • default {@link Locale}s language + country + variant (property defaultLocale, if not null)
    • 
 * 
  • default {@link Locale}s language + country (property defaultLocale, if not null)
    • 
 * 
  • default {@link Locale}s language (property defaultLocale, if not null)
    • 
 * 
  • Default (basename)
    • 
 * 
 *
    File
    InitializableMessageSource.java
    Developer's decision
    Version 1
    Kind of conflict
    Comment