repo: resdb
action: commit
revision: 
path_from: 
revision_from: 0a745779ffd160ff77dbba359fc077ce8a83270a:
path_to: 
revision_to: 

commit 0a745779ffd160ff77dbba359fc077ce8a83270a
Merge: 3ab900b 38fdf66
Author: root 
Date:   Tue Oct 26 18:13:42 2010 -0500

    Merge branch 'master' of git://git1.somerandomnick.ano

    Conflicts:
            doc/www.anonet2.org/public_pod/index.pod

diff --cc doc/www.anonet2.org/public_pod/index.pod
index 1895d7fd23f00364295760cf3e7ff622b3983943,9fc773352ec3b3a514ff2d9863d7a19699013351..bbc9a337960dc15eafca38559ed42ef90a316d1b
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@@ -20,24 -20,16 +20,28 @@@ us and chat, it's very easy
  =over

  =item webchat
+ L (anonymous)

++<<<<<<< HEAD
 +L (automatically hide your identity)
 +
 +=item webchat
 +
 +L (partially hides your identity)
 +
 +=item webchat
 +
 +L (doesn't hide your identity)
++=======
+ L (not anonymous)
++>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313

  =item IRC chat
+ L (hides your identity)

- L (hides your identity)
+ L (hides your identity)

- =item IRC chat
- 
- L (partly hides your identity)
+ L (doesn't hide your identity)

  =item telnet chat

@@@ -57,7 -45,9 +57,13 @@@ Once you're online, you can reconnect t

  =item webchat

++<<<<<<< HEAD
 +L (partially hides your identity)
++=======
+ L (hides your identity)
+ 
+ L (doesn't automatically hide your identity)
++>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313

  =item IRC

-----END OF PAGE-----