resolve conflicts

apollographql · May 7, 2022 · 546f630 · 546f630
1 parent 865062d
commit 546f630
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/react/hooks/useQuery.ts b/src/react/hooks/useQuery.ts
@@ -434,6 +434,7 @@ class InternalState<TData, TVariables> {
     }), [obsQuery]);
 
     const ssrAllowed = !(
+			this.watchQueryOptions.fetchPolicy === 'standby' ||
       this.queryHookOptions.ssr === false ||
       this.queryHookOptions.skip
     );