From ef54a40b9775271e5c35ebcd1e0128638be38013 Mon Sep 17 00:00:00 2001
From: Nick <nick@somerandomnick.ano>
Date: Thu, 28 Oct 2010 03:07:14 +0000
Subject: Revert "Merge branch 'master' of git://git1.somerandomnick.ano"

This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing
changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.
---
 doc/www.anonet2.org/public_pod/index.pod | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'doc')

diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index f9ee5d5..bbc9a33 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -22,7 +22,6 @@ us and chat, it's very easy:
 =item webchat
 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
 
@@ -36,9 +35,6 @@ L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
 =======
 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
-=======
-L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
 
 =item IRC chat
 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
@@ -61,7 +57,6 @@ Once you're online, you can reconnect to IRC from inside AnoNet:
 
 =item webchat
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
 =======
@@ -69,11 +64,6 @@ L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your iden
 
 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
-=======
-L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
-
-L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
 
 =item IRC
 
-- 
cgit v1.2.3