7 lines
293 B
Plaintext
7 lines
293 B
Plaintext
<<<<<<< HEAD
|
|
put ./Trains/LOGZT1_2024-06-14-14-16-29-560.bin CVRT-D-LOGZT1_2024-06-14-14-16-29-560.bin
|
|
=======
|
|
put ./Trains/LOGZT1_2024-07-04-15-45-02-320.bin CVRT-D-LOGZT1_2024-07-04-15-45-02-320.bin
|
|
>>>>>>> Historien_PI
|
|
put ./LOG/LogZT.txt CVRT-LogZT.txt
|
|
put ./ING/IngLog.txt CVRT-IngLog.txt |