fix

dlarocque · dlarocque · commit be567a3c48d7 · 2025-09-30T11:38:06.000-04:00
diff --git a/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Tool.kt b/firebase-ai/src/main/kotlin/com/google/firebase/ai/type/Tool.kt
@@ -72,7 +72,6 @@ internal constructor(
     }
 
     /**
-<<<<<<< HEAD
      * Creates a [Tool] instance that allows you to provide additional context to the models in the
      * form of public web URLs. By including URLs in your request, the Gemini model will access the
      * content from those pages to inform and enhance its response.

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ internal constructor(`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`-<<<<<<< HEAD`
`76`	`75`	`* Creates a [Tool] instance that allows you to provide additional context to the models in the`
`77`	`76`	`* form of public web URLs. By including URLs in your request, the Gemini model will access the`
`78`	`77`	`* content from those pages to inform and enhance its response.`