repo: resdb
action: commit
revision: 
path_from: 
revision_from: 38e59cad825a932352bf2e7d00a42dff9e8d4e3d:
path_to: 
revision_to: 

commit 38e59cad825a932352bf2e7d00a42dff9e8d4e3d
Author: Nick 
Date:   Thu Oct 28 03:13:25 2010 +0000

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

    This reverts commit 0a745779ffd160ff77dbba359fc077ce8a83270a, reversing
    changes made to 3ab900bec3253e8ccfdcba56e752da39723ee6fc.

diff --git a/db/usr/UFO/git b/db/usr/UFO/git

--- a/db/usr/UFO/git
+++ b/db/usr/UFO/git
@@ -1 +1 @@
-http://anogit.ucis.ano/.git/
+http://anogit.ucis.ano/.git/
\ No newline at end of file
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
@@ -20,9 +20,7 @@ us and chat, it's very easy:
 =over

 =item webchat
-L (anonymous)

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

 =item webchat
@@ -32,20 +30,22 @@ L (partiall
 =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)

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

 =item telnet chat

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

 =back

@@ -57,13 +57,7 @@ Once you're online, you can reconnect to IRC from inside AnoNet:

 =item webchat

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

 =item IRC

@@ -71,8 +65,12 @@ L
 (L, if you don't have DNS for some
 reason) (automatically hides your identity)

+=item IRC
+
 L (doesn't automatically hide your identity)

+=item IRC
+
 L
 (L, for the same reason as before
 and if you want you can use SSL on port 6697) (doesn't automatically

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