Fixed trivial merge conflict

micro-manager · Jul 1, 2024 · 52d110a · 52d110a
2 parents 9fcee61 + f154900
commit 52d110a
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/MMDevice/MMDeviceConstants.h b/MMDevice/MMDeviceConstants.h
@@ -141,16 +141,15 @@ namespace MM {
    const char* const g_Keyword_Transpose_MirrorX = "TransposeMirrorX";
    const char* const g_Keyword_Transpose_MirrorY = "TransposeMirrorY";
    const char* const g_Keyword_Transpose_Correction = "TransposeCorrection";
-   const char* const g_Keyword_Closed_Position = "ClosedPosition";
-   const char* const g_Keyword_HubID = "HubID";
-   const char* const g_Keyword_Current_Volume = "Volume_uL";
-   const char* const g_Keyword_Min_Volume = "Min_Volume_uL";
-   const char* const g_Keyword_Max_Volume = "Max_Volume_uL";
-   const char* const g_Keyword_Flowrate = "Flowrate_uL_per_sec";
+   const char* const g_Keyword_Closed_Position  = "ClosedPosition";
+   const char* const g_Keyword_HubID            = "HubID";
+   const char* const g_Keyword_Current_Volume   = "Volume_uL";
+   const char* const g_Keyword_Min_Volume       = "Min_Volume_uL";
+   const char* const g_Keyword_Max_Volume       = "Max_Volume_uL";
+   const char* const g_Keyword_Flowrate         = "Flowrate_uL_per_sec";
    const char* const g_Keyword_Pressure_Imposed = "Pressure Imposed";
    const char* const g_Keyword_Pressure_Measured = "Pressure Measured";
 
-
    // image annotations
    const char* const g_Keyword_Metadata_CameraLabel = "Camera";
    const char* const g_Keyword_Meatdata_Exposure    = "Exposure-ms";