Remove rebase tags

2022-11-04 09:31:21 +01:00
parent 5bf24db841
commit c1904c4dba
1 changed files with 0 additions and 3 deletions
--- a/ADHamaApp/src/hama.cpp
+++ b/ADHamaApp/src/hama.cpp
@@ -1259,11 +1259,8 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){
           printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue);
      }
    }
-<<<<<<< HEAD
-=======
    */

->>>>>>> Add new pv to get timestamp from EVR
    else if (index == hTimingReadoutTime) {
      printf("[DEBUG]::function TimingReadoutTime %f\n", value); 
      m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TIMING_READOUTTIME, &dvalue);