New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🔀 Merge 'main' into 'feature/admin' - Resolve Conflicts & Integrate Updates #4

Closed

ad956 wants to merge 3 commits into main from feature/admin

Owner

ad956 commented Oct 2, 2024

Title: "🔀 Merge 'main' into 'feature/admin' - Resolve Conflicts & Integrate Updates"

Description:

"✨ Fixed merge conflicts from merging 'main' into 'feature/admin':

📄 Updated user dashboard and profile pages in pages.
🛠️ Merged new endpoints for user management in api.
🧩 Resolved conflicts in shared UI components in components.
🔒 Updated authentication library in libs.
🔧 Merged new utility functions for data processing in utils.
📝 Synchronized TypeScript definitions for shared types in types.

ad956 added 3 commits

September 30, 2024 22:28


          refactor: minor type changes

4d08c48


          merge branch 'main' into admin

945c454

 - resolve merge conflicts across the application


          fix: parsing error - merge conflict marker encountered

98e2e71

ad956 closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet