Changeset 15557 for branches/eam_branch_20071023/psModules/src/concepts/pmConceptsAverage.h

Timestamp:

Nov 9, 2007, 2:49:13 PM (19 years ago)

Author:

eugene

Message:

fix minor conflicts with head

File:

• branches/eam_branch_20071023/psModules/src/concepts/pmConceptsAverage.h (modified) (1 diff)

branches/eam_branch_20071023/psModules/src/concepts/pmConceptsAverage.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.9.10.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-11-08 22:59:04 $
+ * @version $Revision: 1.9.10.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-11-10 00:49:13 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */