diff options
| author | Nick <nick@somerandomnick.ano> | 2010-10-28 03:07:14 +0000 |
|---|---|---|
| committer | Nick <nick@somerandomnick.ano> | 2010-10-28 03:07:14 +0000 |
| commit | ef54a40b9775271e5c35ebcd1e0128638be38013 (patch) | |
| tree | 7891dfed47631c940af89abae9b6fe40c23c5af2 /doc | |
| parent | e40a8a950fa1b493c244905d61e49e55e71d84d0 (diff) | |
| download | resdb-ef54a40b9775271e5c35ebcd1e0128638be38013.tar.gz resdb-ef54a40b9775271e5c35ebcd1e0128638be38013.zip | |
Revert "Merge branch 'master' of git://git1.somerandomnick.ano"
This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing
changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.
Diffstat (limited to 'doc')
| -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 |