Projects >> cgeo >>45e624222f7fc319dcbd582be15248a3baf9b30b

Chunk
Conflicting content 
                    }
                }

<<<<<<< HEAD
                downloaded = true;
                Set cachesFromSearchResult = searchResult.getCachesFromSearchResult(LoadFlags.LOAD_WAYPOINTS);
                caches.addAll(cachesFromSearchResult);
=======
                if (search != null) {
                    downloaded = true;
                    Set cachesFromSearchResult = search.getCachesFromSearchResult(LoadFlags.LOAD_WAYPOINTS);
                    // to update the caches they have to be removed first
                    caches.removeAll(cachesFromSearchResult);
                }
                    caches.addAll(cachesFromSearchResult);
>>>>>>> 550eb54d1c76dd2788c43ae9b67d43e57b90bf26

                if (isLiveMode()) {
                    final boolean excludeMine = Settings.isExcludeMyCaches();
Solution content 
                    }
                }

                downloaded = true;
                Set cachesFromSearchResult = searchResult.getCachesFromSearchResult(LoadFlags.LOAD_WAYPOINTS);
                // to update the caches they have to be removed first
                caches.removeAll(cachesFromSearchResult);
                caches.addAll(cachesFromSearchResult);

                if (isLiveMode()) {
                    final boolean excludeMine = Settings.isExcludeMyCaches();
File
CGeoMap.java
Developer's decision
Combination
Kind of conflict
Attribute
If statement
Method invocation
Variable