aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/Main.java
diff options
context:
space:
mode:
authorGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:36:18 +0200
committerGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:39:03 +0200
commit516ef6a30eb59e1b9c3aa297e3595c5acf665530 (patch)
tree2bed5e621be4786816bbf3d6adabe41d2d43fbdb /src/org/traccar/Main.java
parent5bf82eff1ecac7b23661cea14be26aa7a3e4d09a (diff)
parent59f466092c9c875c2bbcb70a2a402aad0edd7639 (diff)
downloadtrackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.gz
trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.tar.bz2
trackermap-server-516ef6a30eb59e1b9c3aa297e3595c5acf665530.zip
Merge branch 'master' into command_framework
Diffstat (limited to 'src/org/traccar/Main.java')
-rw-r--r--src/org/traccar/Main.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java
index 7ff93fda6..1b8d93e34 100644
--- a/src/org/traccar/Main.java
+++ b/src/org/traccar/Main.java
@@ -15,9 +15,10 @@
*/
package org.traccar;
-import java.util.Locale;
import org.traccar.helper.Log;
+import java.util.Locale;
+
public final class Main {
private Main() {