new file <-?-> new file DOTBACKUP.phillips_to_fay-04.control.lth.se/.bash_history new file <-?-> new file DOTBACKUP.phillips_to_fay-04.control.lth.se/.mozilla/firefox/4vcvg4zp.default-release/prefs.js new file <-?-> new file Nextcloud/PhD/Learn/OMPL/E8/obsticals.py [CONFLICT] Skipping DOTBACKUP.phillips_to_fay-04.control.lth.se/.bash_history contents changed on both sides [CONFLICT] Skipping DOTBACKUP.phillips_to_fay-04.control.lth.se/.mozilla/firefox/4vcvg4zp.default-release/prefs.js contents changed on both sides [CONFLICT] Skipping Nextcloud/PhD/Learn/OMPL/E8/obsticals.py contents changed on both sides Synchronization complete at 12:01:17 (4 items transferred, 3 skipped, 0 failed) skipped: DOTBACKUP.phillips_to_fay-04.control.lth.se/.bash_history (contents changed on both sides) skipped: DOTBACKUP.phillips_to_fay-04.control.lth.se/.mozilla/firefox/4vcvg4zp.default-release/prefs.js (contents changed on both sides) skipped: Nextcloud/PhD/Learn/OMPL/E8/obsticals.py (contents changed on both sides) 2024-09-18_12:01:17