props <-?-> props .unison new file <-?-> new file DOTBACKUP.kokotovic_to_fay-04.control.lth.se/.bash_history props <-?-> props Forskning/ECC2024 new file <-?-> new file Forskning/Grafik/coolnet.png new file <-?-> new file Forskning/Grafik/coolnet2.svg new file <-?-> new file MATLAB/DataDriven/Copy_of_WillemsTest.m new file <-?-> new file MATLAB/DataDriven/WillemsTest.m new file <-?-> new file MATLAB/EECI/Scripts/consensus.mlx new file <-?-> new file MATLAB/Plitics/partitest.m new file <-?-> new file MATLAB/jordanm.m new file <-?-> new file Undervisning/Nätverksdynamik/FRTN30_Network_DynamicsHand_in_4.pdf new file <-?-> new file Undervisning/Nätverksdynamik/handin3/handin3/handin3.zip [CONFLICT] Skipping .unison properties changed on both sides [CONFLICT] Skipping DOTBACKUP.kokotovic_to_fay-04.control.lth.se/.bash_history contents changed on both sides [CONFLICT] Skipping Forskning/ECC2024 properties changed on both sides [CONFLICT] Skipping Forskning/Grafik/coolnet.png contents changed on both sides [CONFLICT] Skipping Forskning/Grafik/coolnet2.svg contents changed on both sides [CONFLICT] Skipping MATLAB/DataDriven/Copy_of_WillemsTest.m contents changed on both sides [CONFLICT] Skipping MATLAB/DataDriven/WillemsTest.m contents changed on both sides [CONFLICT] Skipping MATLAB/EECI/Scripts/consensus.mlx contents changed on both sides [CONFLICT] Skipping MATLAB/Plitics/partitest.m contents changed on both sides [CONFLICT] Skipping MATLAB/jordanm.m contents changed on both sides [CONFLICT] Skipping Undervisning/Nätverksdynamik/FRTN30_Network_DynamicsHand_in_4.pdf contents changed on both sides [CONFLICT] Skipping Undervisning/Nätverksdynamik/handin3/handin3/handin3.zip contents changed on both sides Synchronization complete at 17:01:20 (1 item transferred, 12 skipped, 0 failed) skipped: .unison (properties changed on both sides) skipped: DOTBACKUP.kokotovic_to_fay-04.control.lth.se/.bash_history (contents changed on both sides) skipped: Forskning/ECC2024 (properties changed on both sides) skipped: Forskning/Grafik/coolnet.png (contents changed on both sides) skipped: Forskning/Grafik/coolnet2.svg (contents changed on both sides) skipped: MATLAB/DataDriven/Copy_of_WillemsTest.m (contents changed on both sides) skipped: MATLAB/DataDriven/WillemsTest.m (contents changed on both sides) skipped: MATLAB/EECI/Scripts/consensus.mlx (contents changed on both sides) skipped: MATLAB/Plitics/partitest.m (contents changed on both sides) skipped: MATLAB/jordanm.m (contents changed on both sides) skipped: Undervisning/Nätverksdynamik/FRTN30_Network_DynamicsHand_in_4.pdf (contents changed on both sides) skipped: Undervisning/Nätverksdynamik/handin3/handin3/handin3.zip (contents changed on both sides) 2024-10-16_17:01:20