Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source

 Conflicts:

	collect-library/src/main/assets/editormarker.xml

	vtm

...

This commit is contained in:

squallzhjch

2023-06-16 15:24:02 +08:00

parent 083a6fd57a dee79fd63a

commit 89c7fd4585

6 changed files with 136 additions and 139 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

collect-library/src/main/assets/omdb/area_test.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 37 KiB