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

Update README.md #141

Merged
merged 1 commit into from
Apr 21, 2021
Merged

Update README.md #141

merged 1 commit into from
Apr 21, 2021

Conversation

ccampos
Copy link
Contributor

@ccampos ccampos commented Apr 20, 2021

A couple of typos

A couple of typos
@damontgomery
Copy link
Contributor

Thanks, @ccampos .

There is a major PR to move to a newer version of Rector (#134) and that will probably cause a merge conflict with this.

I'm not sure the best path forward to avoid rework / merge conflicts between the two. Maybe I can ping you if that is updated and you can make another PR to get credit? I can also try to figure out how to make a commit as you at that time, but I haven't done that before.

Thanks again.

@mglaman
Copy link
Collaborator

mglaman commented Apr 21, 2021

I think this can be merged without causing conflicts. This is an easier merge, I don't mind rebasing #134 and fixing any conflicts that arise, @damontgomery

@shaal shaal merged commit 3f088dc into palantirnet:master Apr 21, 2021
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.

4 participants