Code review comment for lp:~alecu/ubuntuone-client/timestamp-autofix-1-6

Text conflict in bin/ubuntuone-syncdaemon
Text conflict in configure.ac
Text conflict in libsyncdaemon/syncdaemon-authentication.c
Conflict adding files to nautilus. Created directory.
Conflict because nautilus is not versioned, but has versioned children. Versioned directory.
Contents conflict in nautilus/utils.c
Text conflict in tests/platform/linux/eventlog/test_zg_listener.py
Text conflict in tests/platform/linux/test_dbus.py
Text conflict in tests/platform/test_tools.py
Text conflict in tests/status/test_aggregator.py
Text conflict in tests/syncdaemon/test_action_queue.py
Text conflict in tests/syncdaemon/test_config.py
Text conflict in tests/syncdaemon/test_fsm.py
Text conflict in tests/syncdaemon/test_localrescan.py
Text conflict in ubuntuone/syncdaemon/action_queue.py
Text conflict in ubuntuone/syncdaemon/tritcask.py
16 conflicts encountered.