Mercurial > hg > anonet-resdb
changeset 232:da3307e29b62 draft
Revert "Merge branch 'master' of git://git1.somerandomnick.ano"
This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing
changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.
| author | Nick <nick@somerandomnick.ano> |
|---|---|
| date | Thu, 28 Oct 2010 03:07:14 +0000 |
| parents | 13b137e470cb |
| children | d38c3ed97acd |
| files | doc/www.anonet2.org/public_pod/index.pod |
| diffstat | 1 files changed, 0 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod Thu Oct 28 02:24:52 2010 +0000 +++ b/doc/www.anonet2.org/public_pod/index.pod Thu Oct 28 03:07:14 2010 +0000 @@ -23,7 +23,6 @@ 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> (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 @@ =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