aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model
diff options
context:
space:
mode:
authorGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:51:30 +0200
committerGabor Somogyi <Gabor_Somogyi@epam.com>2016-05-04 14:51:30 +0200
commitbe2e936c935fa8674f09ee3617b1ecfae4b90ff9 (patch)
tree28a5baea817013ea6782b9d199fd31b264a8568e /src/org/traccar/model
parent516ef6a30eb59e1b9c3aa297e3595c5acf665530 (diff)
downloadtraccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.tar.gz
traccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.tar.bz2
traccar-server-be2e936c935fa8674f09ee3617b1ecfae4b90ff9.zip
Merge failure fix
Diffstat (limited to 'src/org/traccar/model')
0 files changed, 0 insertions, 0 deletions