cacu

Repository merge failed

 
Removing wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/stable/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/alpha/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/2.12~rc1.1/i386/alpha/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/2.12.1/i386/stable/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/2.12.1/i386/stable/upgrades.yml
Removing wiki/src/upgrade/v1/Tails/2.12.1/i386/alpha/upgrades.yml.pgp
Removing wiki/src/upgrade/v1/Tails/2.12.1/i386/alpha/upgrades.yml
Removing wiki/src/torrents/files/tails-i386-2.12.torrent
Removing wiki/src/torrents/files/tails-i386-2.12.packages
Removing wiki/src/torrents/files/tails-i386-2.12.iso.sig
Removing wiki/src/torrents/files/tails-i386-2.12.build-manifest
Removing wiki/src/support/tails-support.pt.po
Removing wiki/src/support/tails-support.mdwn
Removing wiki/src/support/tails-support.it.po
Removing wiki/src/support/tails-support.fr.po
Removing wiki/src/support/tails-support.fa.po
Removing wiki/src/support/tails-support.de.po
Auto-merging wiki/src/news/tails-support.fa.po
Auto-merging wiki/src/news/report_2017_05.mdwn
Removing wiki/src/misc/claws_to_icedove.sh
Removing wiki/src/lib/menu.png
Auto-merging wiki/src/install/linux/usb.fa.po
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/debian_requirements.inline.fa.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.fa.po
Auto-merging wiki/src/install/expert/usb.fa.po
Auto-merging wiki/src/index.fr.po
CONFLICT (content): Merge conflict in wiki/src/index.fr.po
Removing wiki/src/inc/stable_i386_version.html
Removing wiki/src/inc/stable_i386_torrent_url.html
Removing wiki/src/inc/stable_i386_iso_url.html
Removing wiki/src/inc/stable_i386_iso_size.html
Removing wiki/src/inc/stable_i386_iso_sig_url.html
Removing wiki/src/inc/stable_i386_gpg_verify.html
Removing wiki/src/inc/stable_i386_date.html
Auto-merging wiki/src/inc/stable_amd64_release_notes.pt.po
Auto-merging wiki/src/inc/stable_amd64_release_notes.it.po
Auto-merging wiki/src/inc/stable_amd64_release_notes.html
Auto-merging wiki/src/inc/stable_amd64_release_notes.fr.po
Auto-merging wiki/src/inc/stable_amd64_release_notes.fa.po
Auto-merging wiki/src/inc/stable_amd64_release_notes.de.po
Auto-merging wiki/src/inc/stable_amd64_gpg_signature_output.html
Removing wiki/src/doc/first_steps/startup_options/offline_mode.pt.po
Removing wiki/src/doc/first_steps/startup_options/offline_mode.mdwn
Removing wiki/src/doc/first_steps/startup_options/offline_mode.it.po
Removing wiki/src/doc/first_steps/startup_options/offline_mode.fr.po
Removing wiki/src/doc/first_steps/startup_options/offline_mode.fa.po
Removing wiki/src/doc/first_steps/startup_options/offline_mode.de.po
Removing wiki/src/doc/first_steps/startup_options/network_configuration.pt.po
Removing wiki/src/doc/first_steps/startup_options/network_configuration.mdwn
Removing wiki/src/doc/first_steps/startup_options/network_configuration.it.po
Removing wiki/src/doc/first_steps/startup_options/network_configuration.fr.po
CONFLICT (modify/delete): wiki/src/doc/first_steps/startup_options/network_configuration.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/startup_options/network_configuration.fa.po left in tree.
Removing wiki/src/doc/first_steps/startup_options/network_configuration.de.po
Auto-merging wiki/src/doc/first_steps/startup_options.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/startup_options.fr.po
Auto-merging wiki/src/doc/first_steps/reset/linux.fr.po
Removing wiki/src/doc/first_steps/persistence/upgrade.pt.po
Removing wiki/src/doc/first_steps/persistence/upgrade.mdwn
Removing wiki/src/doc/first_steps/persistence/upgrade.it.po
Removing wiki/src/doc/first_steps/persistence/upgrade.fr.po
CONFLICT (modify/delete): wiki/src/doc/first_steps/persistence/upgrade.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/first_steps/persistence/upgrade.fa.po left in tree.
Removing wiki/src/doc/first_steps/persistence/upgrade.de.po
Auto-merging wiki/src/doc/first_steps/persistence/configure.fa.po
Auto-merging wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/secure_deletion.fr.po
Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fa.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.pt.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.mdwn
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.it.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.fr.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.fa.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/name.inline.de.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.pt.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.mdwn
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.it.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fr.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.fa.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird/account_creation.inline.de.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.pt.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.mdwn
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.it.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fr.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.fa.po
Auto-merging wiki/src/doc/anonymous_internet/thunderbird.de.po
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.pt.po
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.mdwn
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.it.po
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.fr.po
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.fa.po
Removing wiki/src/doc/anonymous_internet/icedove/replacement.inline.de.po
Removing wiki/src/doc/anonymous_internet/icedove/assistant.png
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove/single_mh.png
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.pt.po
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.mdwn
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.it.po
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fr.po
CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/claws_mail_to_icedove.fa.po left in tree.
Removing wiki/src/doc/anonymous_internet/claws_mail_to_icedove.de.po
Removing wiki/src/doc/anonymous_internet/claws_mail.pt.po
Removing wiki/src/doc/anonymous_internet/claws_mail.mdwn
Removing wiki/src/doc/anonymous_internet/claws_mail.it.po
Removing wiki/src/doc/anonymous_internet/claws_mail.fr.po
Removing wiki/src/doc/anonymous_internet/claws_mail.fa.po
Removing wiki/src/doc/anonymous_internet/claws_mail.de.po
Auto-merging wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization/virt-manager.fa.po
Removing wiki/src/doc/advanced_topics/virtualization/tails-in-jessie.png
Removing wiki/src/doc/advanced_topics/virtualization/preferences-system-symbolic.png
Auto-merging wiki/src/doc/advanced_topics/lan.fa.po
Removing wiki/src/contribute/release_process/test/erase_memory_on_shutdown/virtualbox_dumpguestcore.mdwn
Removing wiki/src/contribute/release_process/test/erase_memory_on_shutdown/qemu_pmemsave.mdwn
Removing wiki/src/contribute/release_process/test/erase_memory_on_shutdown/pxedump.mdwn
Removing wiki/src/contribute/release_process/test/erase_memory_on_shutdown/live_system.mdwn
Removing wiki/src/contribute/release_process/test/erase_memory_on_shutdown.mdwn
Removing wiki/src/contribute/release_process/icedove.mdwn
Removing wiki/src/blueprint/monthly_report/report_2017_02.mdwn
Removing submodules/aufs4-standalone
Auto-merging ikiwiki.setup
Auto-merging features/thunderbird.feature
Auto-merging features/step_definitions/thunderbird.rb
Removing features/images/UnsafeBrowserDNSError.png
Removing features/images/USBUseLiveSystemISO.png
Removing features/images/USBUpgradeFromISO.png
Removing features/images/USBSelectISO.png
Removing features/images/USBInstallationComplete.png
Removing features/images/USBCreateLiveUSBConfirmYes.png
Removing features/images/USBCreateLiveUSBConfirmWindow.png
Removing features/images/USBCreateLiveUSB.png
Removing features/images/USBCloneAndUpgrade.png
Removing features/images/USBCloneAndInstall.png
Removing features/images/USBCannotUpgrade.png
Removing features/images/TorBrowserOfflinePromptStart.png
Removing features/images/TorBrowserOfflinePrompt.png
Removing features/images/TorBrowserOffline.png
Removing features/images/TailsInstallerTooSmallDevice.png
Removing features/images/TailsInstallerQEMUHardDisk.png
Removing features/images/TailsInstallerNoQEMUHardDisk.png
Removing features/images/TailsGreeterWindowsCamouflage.png
Removing features/images/TailsGreeterTorConf.png
Removing features/images/TailsGreeterPersistence.png
Removing features/images/TailsGreeterMoreOptions.png
Removing features/images/TailsGreeterForward.png
Removing features/images/TailsBug11786b.png
Removing features/images/TailsBug11786a.png
Removing features/images/SynapticSearchWindow.png
Removing features/images/SynapticSearchButton.png
Removing features/images/SynapticReloadPrompt.png
Removing features/images/SynapticPackageList.png
Removing features/images/SynapticLoaded.png
Removing features/images/SynapticFailure.png
Removing features/images/SynapticCowsaySearchResultSelected.png
Removing features/images/SynapticCowsaySearchResult.png
Removing features/images/SynapticCowsayMarked.png
Removing features/images/SynapticChangesAppliedPrompt.png
Removing features/images/SynapticApplyPrompt.png
Removing features/images/SynapticApplyButton.png
Removing features/images/SynapticApply.png
Removing features/images/PidginAccountManagerCloseButton.png
Removing features/images/GobbyWindow.png
Removing features/images/GobbyWelcomePrompt.png
Removing features/images/GobbyFailedToShareDocuments.png
Removing features/images/GobbyConnectionComplete.png
Removing features/images/GobbyConnectPrompt.png
Removing features/images/GnomeSSHVerificationConfirm.png
Removing features/images/GnomeSSHSuccess.png
Removing features/images/GnomeFilesConnectToServer.png
Removing features/images/GnomeConnectToServerWindow.png
Removing features/images/GnomeConnectToServerConnectButton.png
Removing features/images/GnomeCloseTopButton.png
Removing features/images/GksuAuthPrompt.png
Removing features/images/GitCloneDone.png
Removing features/images/DesktopTailsDocumentationIcon.png
Removing config/chroot_sources/torproject-obfs4proxy.chroot
Removing config/chroot_sources/torproject-obfs4proxy.binary
Removing config/chroot_sources/testing.chroot
Removing config/chroot_sources/testing.binary
Removing config/chroot_sources/jessie-proposed-updates.chroot
Removing config/chroot_sources/jessie-proposed-updates.binary
Removing config/chroot_sources/jessie-backports.chroot
Removing config/chroot_sources/jessie-backports.binary
Removing config/chroot_local-preseed/live-boot
Removing config/chroot_local-patches/unmute_alsa_channels.patch
Removing config/chroot_local-patches/start_AppArmor_earlier.diff
Removing config/chroot_local-patches/run_kexec-load_on_halt.diff
Removing config/chroot_local-patches/run_kexec-load_even_in_emergency_shutdown.diff
Removing config/chroot_local-patches/keep_spice-vdagent_on_shutdown.diff
Removing config/chroot_local-patches/keep_saned_on_shutdown.diff
Removing config/chroot_local-patches/keep_memlockd_on_shutdown.diff
Removing config/chroot_local-patches/keep_laptop-mode_on_shutdown.diff
Removing config/chroot_local-patches/keep_haveged_on_shutdown.diff
Removing config/chroot_local-patches/do_not_save_mixer_levels_on_shutdown.diff
Removing config/chroot_local-patches/disable-laptop-mode-auto-modules.patch
Removing config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/memory_wipe
Removing config/chroot_local-includes/usr/share/initramfs-tools/hooks/sdmem
Removing config/chroot_local-includes/usr/share/gnome-shell/extensions/topIcons@adel.gadllah@gmail.com/metadata.json
Removing config/chroot_local-includes/usr/share/gnome-shell/extensions/topIcons@adel.gadllah@gmail.com/extension.js
Removing config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/install.rdf
Removing config/chroot_local-includes/usr/local/share/tor-browser-extensions/branding@amnesia.boum.org/defaults/preferences/prefs.js
Removing config/chroot_local-includes/usr/local/sbin/tails-reconfigure-memlockd
Removing config/chroot_local-includes/usr/local/sbin/tails-reconfigure-kexec
Removing config/chroot_local-includes/usr/local/lib/tails-32-bit-notify-user
Auto-merging config/chroot_local-includes/usr/local/lib/onion-grater
Removing config/chroot_local-includes/usr/local/lib/connect-socks
Removing config/chroot_local-includes/usr/local/etc/ssl/certs/hkps.pool.sks-keyservers.net.pem
Removing config/chroot_local-includes/usr/local/bin/tails-boot-to-kexec
Removing config/chroot_local-includes/usr/local/bin/icedove
Removing config/chroot_local-includes/usr/lib/systemd/user/tails-32-bit-notify-user.service
Auto-merging config/chroot_local-includes/lib/systemd/system/tails-shutdown-on-media-removal.service
Removing config/chroot_local-includes/lib/systemd/system/tails-reconfigure-memlockd.service
Removing config/chroot_local-includes/lib/systemd/system/tails-reconfigure-kexec.service
Auto-merging config/chroot_local-includes/lib/systemd/system/onion-grater.service
Removing config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec
Removing config/chroot_local-includes/lib/live/config/2060-create-upgrader-run-directory
Removing config/chroot_local-includes/etc/xdg/autostart/florence.desktop
Removing config/chroot_local-includes/etc/tor/tor-tsocks-git.conf
Removing config/chroot_local-includes/etc/tor-browser/profile/bookmarks.html
Auto-merging config/chroot_local-includes/etc/thunderbird/pref/thunderbird.js
Removing config/chroot_local-includes/etc/ssl/certs/sks-keyservers.netCA.pem
Auto-merging config/chroot_local-includes/etc/skel/.thunderbird/profile.default/chrome/userChrome.css
Removing config/chroot_local-includes/etc/skel/.icedove/profile.default/preferences/0000tails.js
Removing config/chroot_local-includes/etc/skel/.config/keepassx/config.ini
Removing config/chroot_local-includes/etc/modprobe.d/qxl.conf
Removing config/chroot_local-includes/etc/default/ttdnsd
Removing config/chroot_local-includes/etc/default/kexec
Removing config/chroot_local-includes/etc/X11/Xsession.d/56gnome-classic
Removing config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-ttdnsd.sh
Removing config/chroot_local-includes/etc/NetworkManager/conf.d/plugins.conf
Removing config/chroot_local-includes/etc/NetworkManager/conf.d/dhcp-hostname.conf
Removing config/chroot_local-hooks/99-disable-multiarch
Removing config/chroot_local-hooks/65-initramfs-scripts
Removing config/chroot_local-hooks/57-disable-system-config-printer-applet
Removing config/chroot_local-hooks/57-disable-gnome-keyring-gpg-functionality
Removing config/chroot_local-hooks/55-create-tails-keyring
Removing config/chroot_local-hooks/53-icedove-menu
Removing config/chroot_local-hooks/43-adjust_path_to_ibus-unikey_binaries
Removing config/chroot_local-hooks/42-remove_tsocks_binary
Removing config/chroot_local-hooks/18-fake-torbrowser-launcher
Removing config/chroot_local-hooks/15-symlink-places.sqlite
Removing config/chroot_local-hooks/13-override-tbb-branding
Removing config/chroot_local-hooks/13-aufs
Removing config/chroot_local-hooks/12-linux-amd64
Removing config/chroot_local-hooks/12-initramfs-compress
Removing config/chroot_local-hooks/11-enable-icedove-addons
Removing config/chroot_local-hooks/04-apt-architectures
Removing config/chroot_local-hooks/03-dpkg-architectures
Removing config/binary_local-hooks/05-rename-kernels
Automatic merge failed; fix conflicts and then commit the result. (1)
06/21/2017
Serna

Changes pushed
Changes pushed 06/05/2017
Serna

Changes pushed
Changes pushed 06/05/2017
Serna

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 06/05/2017
emmapeel

Changes pushed
Changes pushed 06/05/2017
emmapeel

Changes pushed
Changes pushed 06/05/2017
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 06/05/2017
cacu

Changes pushed
Changes pushed 06/05/2017
cacu

Changes pushed
Changes pushed 06/05/2017
cacu

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 06/05/2017
emmapeel

Changes pushed
Changes pushed 06/02/2017
emmapeel

Changes pushed
Changes pushed 06/02/2017
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 06/02/2017
emmapeel

Changes pushed
Changes pushed 05/31/2017
emmapeel

Changes pushed
Changes pushed 05/31/2017
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 05/31/2017
Serna

Changes pushed
Changes pushed 05/30/2017
Serna

Changes pushed
Changes pushed 05/30/2017
Serna

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 05/30/2017
cacu

Changes pushed
Changes pushed 05/29/2017

Search