Projects >> Osmand >>e85424303a62f7be1ab95f9943ea71e7ed91767b

Chunk
Conflicting content 
package net.osmand.binary;

<<<<<<< HEAD
import gnu.trove.set.hash.TLongHashSet;

import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;

=======
>>>>>>> 63239941350ee16b2e99bc34107e81ee11cdb68a
import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
Solution content 
package net.osmand.binary;

import gnu.trove.set.hash.TLongHashSet;

import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;

import net.osmand.PlatformUtil;
import net.osmand.ResultMatcher;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
File
GeocodingUtilities.java
Developer's decision
Version 1
Kind of conflict
Import