Mercurial > p > roundup > code
comparison roundup/cgi/client.py @ 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 | 777125a21254 |
| children | 02ed2b7180e0 |
comparison
equal
deleted
inserted
replaced
| 1669:17ec0bd6ecc5 | 1670:7936edef5511 |
|---|---|
| 1 <<<<<<< client.py | 1 # $Id: client.py,v 1.65.2.8 2003-06-19 13:45:00 neaj Exp $ |
| 2 # $Id: client.py,v 1.65.2.7 2003-06-10 22:59:22 richard Exp $ | |
| 3 ======= | |
| 4 # $Id: client.py,v 1.65.2.7 2003-06-10 22:59:22 richard Exp $ | |
| 5 >>>>>>> 1.119 | |
| 6 | 2 |
| 7 __doc__ = """ | 3 __doc__ = """ |
| 8 WWW request handler (also used in the stand-alone server). | 4 WWW request handler (also used in the stand-alone server). |
| 9 """ | 5 """ |
| 10 | 6 |