diff options
Diffstat (limited to 'doc/www.anonet2.org/public_pod/index.pod')
| -rw-r--r-- | doc/www.anonet2.org/public_pod/index.pod | 10 |
1 files changed, 0 insertions, 10 deletions
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 @@ -23,7 +23,6 @@ us and chat, it's very easy: 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) =item webchat @@ -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) @@ -62,18 +58,12 @@ 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) ======= 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) >>>>>>> 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 |