Skip to content

Remove conflict in composer.json - #34

Merged
paulbalandan merged 1 commit into
CodeIgniter:1.xfrom
samsonasik:patch-1
Jan 24, 2025
Merged

Remove conflict in composer.json#34
paulbalandan merged 1 commit into
CodeIgniter:1.xfrom
samsonasik:patch-1

Conversation

@samsonasik

Copy link
Copy Markdown
Contributor

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

@samsonasik

Copy link
Copy Markdown
ContributorAuthor

@paulbalandan ready to merge for try 👍

@paulbalandan
paulbalandan merged commit 430e0b4 into CodeIgniter:1.xJan 24, 2025
@samsonasik
samsonasik deleted the patch-1 branch January 24, 2025 19:52
@paulbalandan

Copy link
Copy Markdown
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
Copy Markdown
ContributorAuthor

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

@paulbalandan

Copy link
Copy Markdown
Collaborator

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

@samsonasik

Copy link
Copy Markdown
ContributorAuthor

Sign up for freeto 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

@samsonasik@paulbalandan