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-17 18:43:52 +08:00
parent 11dd8057b1
commit caeb784ad3
1187 changed files with 43186 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-chat/build/intermediates/incremental/packageDebugResources/merger.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res"><file name="call" path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res/raw/call.mp3" qualifiers="" type="raw"/><file name="match1" path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res/raw/match1.mp3" qualifiers="" type="raw"/><file name="match3" path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res/raw/match3.mp3" qualifiers="" type="raw"/><file name="match2" path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/main/res/raw/match2.mp3" qualifiers="" type="raw"/></source><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/build/generated/res/rs/debug"/><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/admin/Android/ADAS/MoGoEagleEye/modules/mogo-module-chat/src/debug/res"/></dataSet><mergedItems/></merger>