inital impl

jlizen · Dec 19, 2024 · bbd4d52 · bbd4d52
1 parent 1af1aed
commit bbd4d52
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -290,11 +290,6 @@ enum ExecutorStrategy {
     SecondaryTokioRuntime(SecondaryTokioRuntimeExecutor),
 }
 
-<<<<<<< Updated upstream
-impl ExecutorStrategy {}
-
-=======
->>>>>>> Stashed changes
 /// Spawn a future to the configured compute-heavy executor and wait on its output.
 /// 
 /// # Strategy selection