resolve conflict

Author: github-actions[bot]

README.md

@@ -8,15 +8,11 @@ The OAuthify library provides a seamless integration for adding OAuth-based logi
 - **Secure Authentication:** Redirects users to the respective service's login page and securely handles the OAuth callback.
 - **Customizable:** Allows for custom handling of successful or failed logins, enabling you to tailor the user experience.
 
-<<<<<<< HEAD
 <!-- ![OAuthify Auth 2.0 headless Component](/src/assets/OAuthify.png) -->
 
 <p align="center">
   <img src="src/assets/OAuthify.png" alt="OAuthify Auth 2.0 headless Component" width="200">
 </p>
-=======
-![OAuthify Auth 2.0 headless Component](/src/assets/OAuthify.png)
->>>>>>> e254e27 (updated readme)
 
 ### Installation
 
@@ -49,28 +45,12 @@ import {
   GoogleIcon,
   GithubIcon,
 } from 'oauthify';
-<<<<<<< HEAD
-=======
-import { useAuth } from './contexts/Auth.context';
+import { useOAuthify } from 'oauthify';
 
->>>>>>> e254e27 (updated readme)
 const googleClientId = 'xxxxxxxxx';
 const githubClientId = 'XXXXXXXX';
 
 const App = () => {
-<<<<<<< HEAD
-  const handleSuccess = (response) => {
-    console.log('Google login success:', response);
-    // Handle successful login, e.g., set user info in app state
-  };
-
-  const handleFailure = (error) => {
-    console.error('Google login failure:', error);
-    // Handle failed login, e.g., show error message to user
-  };
-
-=======
->>>>>>> e254e27 (updated readme)
   return (
     <OAuthifyProvider>
       <div>
@@ -82,17 +62,6 @@ const App = () => {
 };
 
 const LoginComponent = () => {
-<<<<<<< HEAD
-  return (
-    <>
-      <div className="flex flex-row justify-center items-center my-6 space-x-2">
-        <GoogleLoginButton
-          clientId={googleClientId}
-          redirectUri={redirectUri}
-          onSuccess={handleSuccess}
-          onFailure={handleFailure}
-        >
-=======
   const { onSuccess, onFailure, setOnSuccess } = useOAuthify();
 
   const handleSuccess = () => {
@@ -113,7 +82,6 @@ const LoginComponent = () => {
     <>
       <div className="flex flex-row justify-center items-center my-6 space-x-2">
         <GoogleLoginButton clientId={googleClientId} redirectUri={redirectUri}>
->>>>>>> e254e27 (updated readme)
           <div
             style={{
               display: 'flex',
@@ -134,16 +102,7 @@ const LoginComponent = () => {
           </div>{' '}
         </GoogleLoginButton>
 
-<<<<<<< HEAD
-        <GitHubLoginButton
-          clientId={githubClientId}
-          redirectUri={redirectUri}
-          onSuccess={handleSuccess}
-          onFailure={handleFailure}
-        >
-=======
         <GitHubLoginButton clientId={githubClientId} redirectUri={redirectUri}>
->>>>>>> e254e27 (updated readme)
           >
           <div
             style={{

package-lock.json

@@ -24,11 +24,7 @@
   ],
   "types": "dist/types/index.d.ts",
   "private": false,
-<<<<<<< HEAD
-  "version": "0.0.20",
-=======
   "version": "0.0.24",
->>>>>>> e254e27 (updated readme)
   "type": "module",
   "files": [
     "dist"