fix merge conflict causing build failure

This commit is contained in:
Jonathan Kelley committed 2025-10-03 20:18:17 -07:00
1 parent da32278b3a
commit ea35b4de6f
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -145,7 +145,7 @@ where
/// ///
/// When the loader is re-reloading its values, it will no longer suspend its component, making it /// When the loader is re-reloading its values, it will no longer suspend its component, making it
/// very useful for server-side-rendering. /// very useful for server-side-rendering.
pub struct Loader<T> { pub struct Loader<T: 'static> {
/// This is a signal that unwraps the inner value. We can't give it out unless we know the inner value is Some(T)! /// This is a signal that unwraps the inner value. We can't give it out unless we know the inner value is Some(T)!
read_value: ReadSignal<T>, read_value: ReadSignal<T>,
+1 -1
View File
@@ -71,7 +71,7 @@ where
} }
} }
pub struct Action<I, T> { pub struct Action<I, T: 'static> {
reader: ReadSignal<T>, reader: ReadSignal<T>,
error: Signal<Option<CapturedError>>, error: Signal<Option<CapturedError>>,
value: Signal<Option<T>>, value: Signal<Option<T>>,