fix(lib/vscode): conflicts in productService.ts

lib/vscode/src/vs/base/common/product.ts

@@ -26,6 +26,9 @@ export type ExtensionUntrustedWorkspaceSupport = {
 };
 
 export interface IProductConfiguration {
+	// NOTE@coder: add codeServerVersion
+	readonly codeServerVersion?: string;
+
 	readonly version: string;
 	readonly date?: string;
 	readonly quality?: string;