[Zope-Checkins] CVS: Zope/ZServer/medusa - filesys.py:1.9.90.3

[Andreas Jung]

Update of /cvs-repository/Zope/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv21447/ZServer/medusa

Modified Files:
      Tag: Zope-2_5-branch
	filesys.py 
Log Message:
fixed merge conflict


=== Zope/ZServer/medusa/filesys.py 1.9.90.2 => 1.9.90.3 ===
             mode,
             stat_info[stat.ST_NLINK],
-<<<<<<< filesys.py
-            stat_info[stat.ST_UID].replace(' ','_'),
-            stat_info[stat.ST_GID].replace(' ','_'),
-=======
             user,
             group,
->>>>>>> 1.11
             stat_info[stat.ST_SIZE],
             date,
             file