Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix compilation error

Browse source
This commit is contained in:
Victor Shcherb 2012-06-25 01:43:25 +02:00
parent 705585a557
commit d1e284dc46
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DataExtractionOSM/src/net/osmand/osm/MapRoutingTypes.java
View file

@ -25,10 +25,7 @@ public class MapRoutingTypes {
TAGS_TO_ACCEPT.add("route");
// TEXT tags
<<<<<<< HEAD
=======
TAGS_TEXT.add("int_ref");
>>>>>>> Add ferry rendering + add text to route information
TAGS_TEXT.add("ref");
TAGS_TEXT.add("name");
TAGS_TEXT.add("direction");