|
None
Repository merge failed |
10/04/2018
|
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |
|
None
Repository merge failed |
Removing wiki/src/torrents/files/tails-amd64-3.9.torrent Removing wiki/src/torrents/files/tails-amd64-3.9.iso.sig Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.packages Auto-merging wiki/src/torrents/files/tails-amd64-3.9.1.build-manifest Auto-merging wiki/src/install/win/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb.de.po Auto-merging wiki/src/install/win/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-overview.de.po Auto-merging wiki/src/install/win/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.de.po Auto-merging wiki/src/install/win/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/win/clone-overview.de.po Auto-merging wiki/src/install/win.de.po CONFLICT (content): Merge conflict in wiki/src/install/win.de.po Auto-merging wiki/src/install/vm-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/vm-download.de.po Auto-merging wiki/src/install/mac/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.de.po Auto-merging wiki/src/install/mac/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-overview.de.po Auto-merging wiki/src/install/mac/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.de.po Auto-merging wiki/src/install/mac/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac/clone-overview.de.po Auto-merging wiki/src/install/mac.de.po CONFLICT (content): Merge conflict in wiki/src/install/mac.de.po Auto-merging wiki/src/install/linux/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.de.po Auto-merging wiki/src/install/linux/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-overview.de.po Auto-merging wiki/src/install/linux/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.de.po Auto-merging wiki/src/install/linux/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/linux/clone-overview.de.po Auto-merging wiki/src/install/expert/usb.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.de.po Auto-merging wiki/src/install/expert/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/expert/usb-overview.de.po Auto-merging wiki/src/install/dvd-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.de.po Auto-merging wiki/src/install/debian/usb-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-overview.de.po Auto-merging wiki/src/install/debian/usb-download.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.de.po Auto-merging wiki/src/install/debian/clone-overview.de.po CONFLICT (content): Merge conflict in wiki/src/install/debian/clone-overview.de.po Auto-merging po/de.po Auto-merging po/ca.po Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/thunderbird.sh Automatic merge failed; fix conflicts and then commit the result. (1)10/04/2018 |