diff options
| author | Ivan Muratov <binakot@gmail.com> | 2017-10-24 14:52:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 14:52:48 +0300 |
| commit | db02157dbb29539dda4b51a5e8b317293cfc536c (patch) | |
| tree | b974f082172406e16a92cb9da8136ef856f571a5 /setup/traccar.xml | |
| parent | 09d3cf2b5416327700ad22b652cf4a0dca09aaf2 (diff) | |
| parent | 96e15853b9c28bd31295ca2c014e226e4a50aaa1 (diff) | |
| download | traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.gz traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.bz2 traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.zip | |
Merge branch 'master' into master
Diffstat (limited to 'setup/traccar.xml')
| -rw-r--r-- | setup/traccar.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setup/traccar.xml b/setup/traccar.xml index 61e23a066..aab9ba311 100644 --- a/setup/traccar.xml +++ b/setup/traccar.xml @@ -4,6 +4,8 @@ <properties> + <entry key='config.default'>./conf/default.xml</entry> + <!-- This is the main configuration file. All your configuration parameters should be placed in this file. @@ -16,8 +18,6 @@ --> - <entry key="config.default">./conf/default.xml</entry> - <entry key='database.driver'>org.h2.Driver</entry> <entry key='database.url'>jdbc:h2:./data/database</entry> <entry key='database.user'>sa</entry> |