6 lines
948 B
XML
6 lines
948 B
XML
<<<<<<< HEAD
|
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
<dwsync>
|
|
<file name="grid_12-825-55-15.css" server="87.239.18.198/httpdocs/staging/" local="3604986727" remote="3604921920" Dst="-1" />
|
|
<file name="specimen_stylesheet.css" server="87.239.18.198/httpdocs/staging/" local="3604986727" remote="3604921920" Dst="-1" />
|
|
</dwsync>
|
|
=======
|
|
<?xml version="1.0" encoding="utf-8" ?>
|
|
<dwsync>
|
|
<file name="grid_12-825-55-15.css" server="87.239.18.198/httpdocs/staging/" local="3604386412" remote="3604393080" Dst="-1" />
|
|
<file name="specimen_stylesheet.css" server="87.239.18.198/httpdocs/staging/" local="3604386412" remote="3604393080" Dst="-1" />
|
|
<file name="grid_12-825-55-15.css" server="87.239.18.198/httpdocs/dev/" local="3604913120" remote="3604393620" Dst="-1" />
|
|
<file name="specimen_stylesheet.css" server="87.239.18.198/httpdocs/dev/" local="3604913120" remote="3604393620" Dst="-1" />
|
|
</dwsync>
|
|
>>>>>>> 68d4d49ec76549a030f864907fc2395e38ce2710
|