fixed conflicts

swastikCommits · swastikCommits · commit 6a7f8bfbfcb9 · 2025-04-20T21:39:52.000+05:30
diff --git a/src/lib/api/product.ts b/src/lib/api/product.ts
@@ -11,7 +11,7 @@ export class ProductsApi {
 	}
 
 	async getProductAttributes(barcode: string): Promise<ProductAttribute[]> {
-		const apiVersion = import.meta.env.VITE_API_VERSION || DEFAULT_API_VERSION;
+		const apiVersion = import.meta.env.VITE_API_VERSION || '3';
 		const url = `${API_HOST}/api/v${apiVersion}/product/${barcode}?fields=product_name,code,attribute_groups_en`;
 
 		const res = await this.fetch(url);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export class ProductsApi {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`async getProductAttributes(barcode: string): Promise<ProductAttribute[]> {`
`14`		`- const apiVersion = import.meta.env.VITE_API_VERSION \|\| DEFAULT_API_VERSION;`
	`14`	`+ const apiVersion = import.meta.env.VITE_API_VERSION \|\| '3';`
`15`	`15`	const url = `${API_HOST}/api/v${apiVersion}/product/${barcode}?fields=product_name,code,attribute_groups_en`;
`16`	`16`
`17`	`17`	`const res = await this.fetch(url);`