Mercurial > hg > anonet-resdb

changeset 227:abee74e3817d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of git://git1.somerandomnick.ano Conflicts: doc/www.anonet2.org/public_pod/index.pod
author root <root@HAL2000.(none)>
date Tue, 26 Oct 2010 21:26:17 -0500
parents f983a3b6a7ab (current diff) e02a20171ee0 (diff)
children 350b492e8295
files doc/www.anonet2.org/public_pod/index.pod
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 18:13:42 2010 -0500
+++ b/doc/www.anonet2.org/public_pod/index.pod	Tue Oct 26 21:26:17 2010 -0500
@@ -23,6 +23,7 @@
 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
@@ -35,6 +36,9 @@
 =======
 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)
@@ -58,12 +62,18 @@
 =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