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
610 B
XML
2 lines
610 B
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\main\assets"/><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\work\Launcher_os_2\Launcher\test\crashreport\src\debug\assets"/></dataSet></merger> |