resolved more cinflicts

Plant-for-the-Planet-org · Jan 11, 2022 · f5632af · f5632af
1 parent 69d0550
commit f5632af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/next-env.d.ts b/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/src/Layout/QueryParamContext.tsx b/src/Layout/QueryParamContext.tsx
@@ -68,14 +68,10 @@ export const QueryParamContext = React.createContext({
   paymentError: "",
   setPaymentError: (value: string) => { },
   amount: null,
-<<<<<<< HEAD
-  setAmount: (value: number) => {},
-  taxIdentificationAvail: {},
-  setTaxIdentificationAvail: (value: boolean) => {}
-=======
   setAmount: (value: number) => { },
+  taxIdentificationAvail: {},
+  setTaxIdentificationAvail: (value: boolean) => {},
   callbackMethod: "",
->>>>>>> develop
 });
 
 export default function QueryParamProvider({ children }: any) {
@@ -139,12 +135,9 @@ export default function QueryParamProvider({ children }: any) {
   const [country, setcountry] = useState<string | string[]>("");
   const [currency, setcurrency] = useState("");
   const [returnTo, setreturnTo] = useState("");
-<<<<<<< HEAD
   const [taxIdentificationAvail, setTaxIdentificationAvail] = useState(false)
-=======
   const [callbackMethod, setCallbackMethod] = useState("");
 
->>>>>>> develop
   const [redirectstatus, setredirectstatus] = useState(null);
 
   const [shouldCreateDonation, setshouldCreateDonation] = useState(false);
@@ -482,12 +475,9 @@ export default function QueryParamProvider({ children }: any) {
         setAmount,
         transferDetails,
         setTransferDetails,
-<<<<<<< HEAD
         taxIdentificationAvail,
-        setTaxIdentificationAvail
-=======
+        setTaxIdentificationAvail,
         callbackMethod,
->>>>>>> develop
       }}
     >
       {children}