b199b39752
# Conflicts: # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainServiceController.kt # libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
2 lines
1.6 KiB
XML
2 lines
1.6 KiB
XML
<?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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\main\res"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\build\generated\res\rs\debug"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\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:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport-bugly\src\debug\res"/></dataSet><mergedItems/></merger> |