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

Fix merge conflict #47

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Fix merge conflict #47

merged 2 commits into from
Sep 21, 2023

Conversation

2mawi2
Copy link
Contributor

@2mawi2 2mawi2 commented Jun 8, 2023

This commit removes a duplicate statements that must have got onto the main during a merge.
Furthermore, it adds to command line arguments to the documentation that where missing.

@kyushuadamu
Copy link

@2mawi2

I just stumbled across this project and thought I would try it. I ran into the problem that you fixed (thanks!).

In README.md your pull request has a duplicated line:

- `-c`, `--count`: The number of commands to output when JSON output is specified.
- `-c`, `--count`: The number of commands to output when JSON output is specified.

@JoelKronander JoelKronander merged commit 317ccd0 into opensouls:main Sep 21, 2023
2 checks passed
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

3 participants