[3proxy/el5/master: 13/13] - Add man3/3proxy.cfg.3 man (BZ#648204). - Gone explicit man gzip - leave it for rpm.

[Pavel Alexeev]

commit 562ee66f2d0d2f92752f74865bb5306ca0898709
Merge: 04b959c c5cc3de
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Thu Nov 4 23:24:00 2010 +0300

    - Add man3/3proxy.cfg.3 man (BZ#648204).
    - Gone explicit man gzip - leave it for rpm.

 .gitignore  |    2 +-
 3proxy.cfg  |    4 ++++
 3proxy.spec |   14 +++++++++-----
 sources     |    2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)
---
diff --cc 3proxy.cfg
index 55d2aee,1c038ac..27a353f
--- a/3proxy.cfg
+++ b/3proxy.cfg
@@@ -175,4 -175,4 +175,8 @@@ admi
  # now we needn't any root rights. We can chroot and setgid/setuid.
  
  
++<<<<<<< HEAD
 +###$Id: 3proxy.cfg,v 1.1 2009/08/27 20:43:43 hubbitus Exp $#######
++=======
+ ###$Id: 3proxy.cfg.sample,v 1.5 2004/07/16 12:37:20 vlad Exp $#######
++>>>>>>> origin/master