Projects >> cgeo >>2fd3060213c74747d76cb104a3ecb693a3352781

Chunk
Conflicting content 
        register(R.string.caches_filter_modified, ModifiedFilter.class);
        register(R.string.caches_filter_origin, OriginFilter.Factory.class);
        register(R.string.caches_filter_distance, DistanceFilter.Factory.class);
<<<<<<< HEAD
        register(R.string.caches_filter_personal_note, PersonalNoteFilter.class);
=======
        register(R.string.caches_filter_popularity, PopularityFilter.Factory.class);
>>>>>>> 653c85552f87a47218330a65642a2a4515255538

        // sort by localized names
        Collections.sort(registry, new Comparator() {
Solution content 
        register(R.string.caches_filter_modified, ModifiedFilter.class);
        register(R.string.caches_filter_origin, OriginFilter.Factory.class);
        register(R.string.caches_filter_distance, DistanceFilter.Factory.class);
        register(R.string.caches_filter_personal_note, PersonalNoteFilter.class);
        register(R.string.caches_filter_popularity, PopularityFilter.Factory.class);

        // sort by localized names
        Collections.sort(registry, new Comparator() {
File
FilterUserInterface.java
Developer's decision
Concatenation
Kind of conflict
Method invocation