Changeset 22419 for branches/cnb_branch_20090215/ppSub/src/ppSub.h

Timestamp:

Feb 22, 2009, 10:26:32 PM (17 years ago)

Author:

beaumont

Message:

Added pmStackVisual file. Still learning ins and outs of svn

File:

• branches/cnb_branch_20090215/ppSub/src/ppSub.h (modified) (1 diff)

branches/cnb_branch_20090215/ppSub/src/ppSub.h

@@ -6 +6 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */