|
emmapeel
Repository merge failed |
9 years ago
|
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
deleted-20
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/support/known_issues.de.po CONFLICT (content): Merge conflict in wiki/src/support/known_issues.de.po Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/upgrade.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/upgrade.de.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.de.po Auto-merging wiki/src/doc/first_steps/installation/manual/mac.de.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/installation/manual/mac.de.po Auto-merging wiki/src/doc/first_steps/accessibility.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/accessibility.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/anonymous_internet/unsafe_browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/unsafe_browser.de.po Auto-merging wiki/src/doc/anonymous_internet/Tor_Browser.de.po CONFLICT (content): Merge conflict in wiki/src/doc/anonymous_internet/Tor_Browser.de.po Auto-merging wiki/src/doc/advanced_topics/virtualization.de.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.de.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
AtomiKe
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |
|
emmapeel
Repository merge failed |
Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig Removing wiki/src/torrents/files/tails-i386-1.4.1.torrent Removing wiki/src/torrents/files/tails-i386-1.4.1.iso.sig Auto-merging wiki/src/press.pt.po CONFLICT (content): Merge conflict in wiki/src/press.pt.po Auto-merging wiki/src/press.fr.po CONFLICT (content): Merge conflict in wiki/src/press.fr.po Auto-merging wiki/src/news/signing_key_transition.fr.po CONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po Auto-merging wiki/src/news/report_2015_07.mdwn Auto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po Auto-merging wiki/src/doc/first_steps/start_tails.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po Auto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po Auto-merging wiki/src/doc/advanced_topics/paperkey.fr.po CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po Removing wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn Removing features/images/UnsafeBrowserWindow.png Removing features/images/UnsafeBrowserPreferencesMenuItem.png Removing features/images/UnsafeBrowserEditPreferences.png Removing features/images/UnsafeBrowserEditMenu.png Removing features/images/UnsafeBrowserAdvancedSettings.png Removing features/images/USBSuggestsInstall.png Removing features/images/TorBrowserUnableToOpen.png Removing features/images/TailsInstallerNoDevice.png Removing config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff Removing config/chroot_local-patches/apparmor-adjust-home-tunable.diff Automatic merge failed; fix conflicts and then commit the result. (1)9 years ago |