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 merge aritfacts and fix a typo #1741

Merged
merged 1 commit into from Mar 27, 2020
Merged

Conversation

rc9000
Copy link
Contributor

@rc9000 rc9000 commented Mar 27, 2020

Hi team! I noticed some merge conflict markers in the published documentation at https://jdbc.postgresql.org/documentation/head/connect.html, here's a fixed version that also corrects an "if" that should be an "in" in the same paragraph.

@davecramer
Copy link
Member

davecramer commented Mar 27, 2020

nice catch!, Thanks

@davecramer davecramer merged commit 3871bfd into pgjdbc:master Mar 27, 2020
2 checks passed
davecramer pushed a commit to davecramer/pgjdbc that referenced this issue Jul 5, 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.

None yet

2 participants