resolved conflict in RouteServer
This commit is contained in:
commit
5e34d0320b
12 changed files with 16 additions and 16 deletions
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>org.btools</groupId>
|
||||
<artifactId>brouter</artifactId>
|
||||
<version>0.98</version>
|
||||
<version>0.9.8-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>brouter-server</artifactId>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public class BRouter
|
|||
}
|
||||
System.exit(0);
|
||||
}
|
||||
System.out.println("BRouter 0.98 / 12012014 / abrensch");
|
||||
System.out.println("BRouter 0.9.8 / 12012014 / abrensch");
|
||||
if ( args.length < 6 )
|
||||
{
|
||||
System.out.println("Find routes in an OSM map");
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ public class RouteServer extends Thread
|
|||
|
||||
public static void main(String[] args) throws Exception
|
||||
{
|
||||
System.out.println("BRouter 0.98 / 12012014 / abrensch");
|
||||
System.out.println("BRouter 0.9.8 / 12012014 / abrensch");
|
||||
if ( args.length != 4 )
|
||||
{
|
||||
System.out.println("serve BRouter protocol");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue