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

commit ef54a40b9775271e5c35ebcd1e0128638be38013
Author: Nick 
Date:   Thu Oct 28 03:07:14 2010 +0000

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

    This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing
    changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.

diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod

--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -22,7 +22,6 @@ us and chat, it's very easy:
 =item webchat
 L (anonymous)

-<<<<<<< HEAD
 <<<<<<< HEAD
 L (automatically hide your identity)

@@ -36,9 +35,6 @@ L (doesn't hide your identity)
 =======
 L (not anonymous)
 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
-=======
-L (not anonymous)
->>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333

 =item IRC chat
 L (hides your identity)
@@ -61,7 +57,6 @@ Once you're online, you can reconnect to IRC from inside AnoNet:

 =item webchat

-<<<<<<< HEAD
 <<<<<<< HEAD
 L (partially hides your identity)
 =======
@@ -69,11 +64,6 @@ L (hides your iden

 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-----