Index: /trunk/ippconfig/megacam/camera.config
===================================================================
--- /trunk/ippconfig/megacam/camera.config	(revision 12821)
+++ /trunk/ippconfig/megacam/camera.config	(revision 12822)
@@ -191,5 +191,4 @@
 
    ### output file definitions
-<<<<<<< camera.config
    TYPE                  OUTPUT FILENAME.RULE                  FILE.TYPE  DATA.LEVEL FILE.SAVE FILE.FORMAT
    PPIMAGE.OUTPUT.SPL    OUTPUT {OUTPUT}.{CHIP.NAME}.fits      IMAGE      CHIP       TRUE      SPLIT