From 52994faa88fea99c4758bcc5459d7145ded40102 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 12 Mar 2026 23:26:03 -0600
Subject: [PATCH] bad merge

---
 crates/editor/src/runnables.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/runnables.rs b/crates/editor/src/runnables.rs
index b555602536cf2ee8ec293ba0feb3f6261a63b71a..43656911349ed55fc2b470845dfe4867703d32c7 100644
--- a/crates/editor/src/runnables.rs
+++ b/crates/editor/src/runnables.rs
@@ -722,7 +722,7 @@ mod tests {
     impl ContextProvider for TestRustContextProvider {
         fn associated_tasks(
             &self,
-            _: Option<Arc<dyn language::File>>,
+            _: Option<Entity<language::Buffer>>,
             _: &gpui::App,
         ) -> Task<Option<TaskTemplates>> {
             Task::ready(Some(TaskTemplates(vec![