From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 8 Mar 2023 00:19:46 +0000 (-0800)
Subject: Correct auto-merge error in vm_tools_version.h - stable-12.1.x to master.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed34acd62f67aceace5f28d214dc8e47b6e35691;p=thirdparty%2Fopen-vm-tools.git

Correct auto-merge error in vm_tools_version.h - stable-12.1.x to master.
---

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index f9ad2eaee..30d31f410 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1743,16 +1743,9 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_NEXT_V_MNR  2
 #define   TOOLS_VERSION_NEXT_V_BASE 0
 
-#ifndef RC_INVOKED
-#define   TOOLS_VERSION_MITER_SAW_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_MITER_SAW_UPDATE1_V)
-#endif /* RC_INVOKED */
-#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_MJR  12
-#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_MNR  1
-#define   TOOLS_VERSION_MITER_SAW_UPDATE1_V_BASE 5
-
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_MITER_SAW_UPDATE1
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_MITER_SAW_UPDATE1)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_MITER_SAW_UPDATE1)
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
 
 /*
  * The extended Tools version is the current Tools version with the