fixBug

blanktonio · Jan 11, 2023 · c7c803c · c7c803c
2 parents c384851 + c7ae315
commit c7c803c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/dpcmd.c b/dpcmd.c
@@ -500,7 +500,11 @@ int main(int argc, char* argv[])
     unsigned long r;
     char* env;
 
+<<<<<<< HEAD
     printf("\nDpCmd Linux 1.13.11.%02d Engine Version:\nLast Built on October 27 2021\n\n", GetConfigVer()); // 1. new feature.bug.configS
+=======
+    printf("\nDpCmd Linux 1.12.11.%02d Engine Version:\nLast Built on January 7 2023\n\n", GetConfigVer()); // 1. new feature.bug.configS
+>>>>>>> c7ae315afb55178ec7fd2cf7cdfc76a04081421d
 
     g_ucOperation = 0;
     GetLogPath(g_LogPath);