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
2020-02-27 21:25:47 +08:00
parent d9e6792091
commit 8f62dd40e1
314 changed files with 8091 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-tanlu/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/Launcher/modules/mogo-module-tanlu/src/main/assets"/><source path="/Users/admin/Android/ADAS/Launcher/modules/mogo-module-tanlu/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/Launcher/modules/mogo-module-tanlu/src/debug/assets"/></dataSet></merger>