Skip to content
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.

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

Remove conflict in composer.json #34

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Conversation

samsonasik
Copy link
Contributor

@paulbalandan it seems still error now, let's remove conflict.

@samsonasik
Copy link
Contributor Author

@paulbalandan ready to merge for try 👍

@paulbalandan paulbalandan merged commit 430e0b4 into CodeIgniter:1.x Jan 24, 2025
9 checks passed
@samsonasik samsonasik deleted the patch-1 branch January 24, 2025 19:52
@paulbalandan
Copy link
Collaborator

It's almost 4 AM here so I'm not able to make a release. If you can do a require to latest dev there to test, that would be great. I'll do the release later in the day.

@samsonasik
Copy link
Contributor Author

I don't have push access to this repo so I can wait :)

@paulbalandan
Copy link
Collaborator

No, i mean in the main repo. Change the tag of this to the latest dev version.

@samsonasik
Copy link
Contributor Author

sure codeigniter4/CodeIgniter4#9436

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants