Index: branches/cnb_branch_20090215/ppSub/src/ppSub.h
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSub.h	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSub.h	(revision 22419)
@@ -6,6 +6,11 @@
  *
  *  @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
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c	(revision 22419)
@@ -6,6 +6,11 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.58.2.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.33.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.23.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c	(revision 22419)
@@ -6,6 +6,11 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.112.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c	(revision 22419)
@@ -6,6 +6,11 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.4.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
Index: branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c
===================================================================
--- branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c	(revision 21536)
+++ branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c	(revision 22419)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */