Update of /cvsroot/AccessGrid/AccessGrid In directory pachelbel.mcs.anl.gov:/tmp/cvs-serv27900 Modified Files: AGParameter.py Log Message: There was some bizarre (entire file) based conflict. I think I resolved it correctly. It looked like it was the single TYPE line on the first parameter class.