yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
lixiaopeng
2022-03-22 10:34:06 +08:00
parent a39f310331
commit f2307e6683
300 changed files with 12240 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/map-custom/build/intermediates/incremental/packageDebugAssets/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/mogo-core-data/src/main/assets"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/mogo-core-data/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/core/mogo-core-data/src/debug/assets"/></dataSet></merger>