Fixed conflict

UdayRajSahai2 · UdayRajSahai2 · commit 1c3fa1775e68 · 2026-03-27T11:44:30.000+05:30
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/edit/[id]/details/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/aimodels/edit/[id]/details/page.tsx
@@ -305,7 +305,7 @@ export default function AIModelDetailsPage() {
     }
 
     if (!isValidHttpUrl(trimmedWebsite)) {
-      toast('Please enter a valid URL that includes http or https.', {
+      toast('Please enter a valid URL that includes https.', {
         id: AI_MODEL_VALIDATION_TOAST_ID,
       });
       return;

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ export default function AIModelDetailsPage() {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`if (!isValidHttpUrl(trimmedWebsite)) {`
`308`		`- toast('Please enter a valid URL that includes http or https.', {`
	`308`	`+ toast('Please enter a valid URL that includes https.', {`
`309`	`309`	`id: AI_MODEL_VALIDATION_TOAST_ID,`
`310`	`310`	`});`
`311`	`311`	`return;`