repo: resdb
action: commit
revision: 
path_from: 
revision_from: ba3a6ce7443f675177d6e2cbc7e777b99120da79:
path_to: 
revision_to: 

commit ba3a6ce7443f675177d6e2cbc7e777b99120da79
Merge: 0a74577 303adb6
Author: root 
Date:   Tue Oct 26 21:26:17 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 bbc9a337960dc15eafca38559ed42ef90a316d1b,6fef6d2fd26c9907ec16ff2d61587fa4b3276ab7..f9ee5d54b558356d3a40877a12fd2266c53d4d23
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@@ -22,19 -22,7 +22,23 @@@ us and chat, it's very easy
  =item webchat
  L (anonymous)

++<<<<<<< HEAD
 +<<<<<<< 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
++=======
+ L (not anonymous)
++>>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333

  =item IRC chat
  L (hides your identity)
@@@ -57,13 -45,9 +61,19 @@@ Once you're online, you can reconnect t

  =item webchat

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

  =item IRC

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