emmapeel

Repository merge failed

 
Removing wiki/src/torrents/files/tails-i386-2.12~rc1.iso.sig
Auto-merging wiki/src/torrents/files/tails-i386-2.12.packages
Auto-merging wiki/src/torrents/files/tails-i386-2.12.build-manifest
Removing wiki/src/torrents/files/tails-i386-2.11.torrent
Removing wiki/src/torrents/files/tails-i386-2.11.iso.sig
Auto-merging wiki/src/doc/first_steps/startup_options.fr.po
CONFLICT (modify/delete): wiki/src/doc/anonymous_internet/i2p.pt.po deleted in origin/master and modified in HEAD. Version HEAD of wiki/src/doc/anonymous_internet/i2p.pt.po left in tree.
Removing wiki/src/doc/anonymous_internet/i2p.mdwn
Removing wiki/src/doc/anonymous_internet/i2p.it.po
Removing wiki/src/doc/anonymous_internet/i2p.fr.po
Removing wiki/src/doc/anonymous_internet/i2p.fa.po
Removing wiki/src/doc/anonymous_internet/i2p.de.po
Removing wiki/src/contribute/design/I2P_Browser.mdwn
Removing wiki/src/contribute/design/I2P.mdwn
Removing features/step_definitions/i2p.rb
Removing features/images/PidginI2PConversationTab.png
Removing features/images/PidginI2PChannelWelcome.png
Removing features/images/PidginI2PChannelEntry.png
Removing features/images/PidginAccount_I2P.png
Removing features/images/I2PTunnelsReady.png
Removing features/images/I2PSharedClientTunnels.png
Removing features/images/I2PRouterConsole.png
Removing features/images/I2PNetworkHidden.png
Removing features/images/I2PFailedToStart.png
Removing features/images/I2PBrowserStopNotification.png
Removing features/images/I2PBrowserStartNotification.png
Removing features/images/I2PBrowserProjectHomepage.png
Removing features/images/I2PBrowserNewTabButton.png
Removing features/images/I2PBootstrapFailure.png
Removing features/i2p.feature
Removing config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/userChrome.css
Removing config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/theme.js
Removing config/chroot_local-includes/usr/share/tails/chroot-browsers/i2p-browser/prefs.js
Removing config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in
Removing config/chroot_local-includes/usr/local/sbin/tails-i2p
Removing config/chroot_local-includes/usr/local/sbin/i2p-browser
Removing config/chroot_local-includes/usr/local/lib/tails-shell-library/i2p.sh
Removing config/chroot_local-includes/usr/local/lib/tails-i2p-removal-notify-user
Removing config/chroot_local-includes/usr/lib/systemd/user/tails-i2p-removal-notify-user.service
Removing config/chroot_local-includes/lib/systemd/system/i2p.service.d/AppArmor.conf
Removing config/chroot_local-includes/lib/live/config/2080-install-i2p
Removing config/chroot_local-includes/etc/NetworkManager/dispatcher.d/30-i2p.sh
Removing config/chroot_local-hooks/97-remove_i2p
Removing config/chroot_local-hooks/16-i2p_config
Removing config/chroot_local-hooks/06-adduser_i2pbrowser
Automatic merge failed; fix conflicts and then commit the result. (1)
04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Repository merged
Repository merged

Original revision: N/A
New revision: N/A 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017
emmapeel

Changes pushed
Changes pushed 04/19/2017

Search