Mercurial > p > roundup > code
changeset 1670:7936edef5511 maint-0.5
Tidied silly conflict (CVS id line)
| author | Jean Jordaan <neaj@users.sourceforge.net> |
|---|---|
| date | Thu, 19 Jun 2003 13:45:00 +0000 |
| parents | 17ec0bd6ecc5 |
| children | 02ed2b7180e0 |
| files | roundup/cgi/client.py |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/roundup/cgi/client.py Wed Jun 18 23:52:54 2003 +0000 +++ b/roundup/cgi/client.py Thu Jun 19 13:45:00 2003 +0000 @@ -1,8 +1,4 @@ -<<<<<<< client.py -# $Id: client.py,v 1.65.2.7 2003-06-10 22:59:22 richard Exp $ -======= -# $Id: client.py,v 1.65.2.7 2003-06-10 22:59:22 richard Exp $ ->>>>>>> 1.119 +# $Id: client.py,v 1.65.2.8 2003-06-19 13:45:00 neaj Exp $ __doc__ = """ WWW request handler (also used in the stand-alone server).