yanh
/
CNAS
1
0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 0 Уики Activity
CNAS取数仪器端升级
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 Ревизии
3 Клонове
530MB
ИН на ревизия: c69b2cbb94
Клонове Маркери
${ item.name }
Create branch ${ searchTerm }
от 'c69b2cbb94'
${ noResults }
CNAS/dll/DataConfig/aaa.xml

6 lines
656B
Директен файл Blame История 

  1. <<<<<<< HEAD

  2. <?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>-10</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>-10</ShowLogDays><YQName>aaa</YQName></SystemFormatConfig>

  3. =======

  4. <?xml version="1.0" encoding="utf-8"?><SystemFormatConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><ShowDelayDays>0</ShowDelayDays><TableInfoMode>0</TableInfoMode><ShowLogDays>0</ShowLogDays><YQName>aaa</YQName></SystemFormatConfig>

  5. >>>>>>> e61dd2ce015f609324a2df3f403e999bf1c3591b