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 recursive directories #841

Merged
merged 6 commits into from
Sep 7, 2024
Merged

Fix recursive directories #841

merged 6 commits into from
Sep 7, 2024

Conversation

heraplem
Copy link

@heraplem heraplem commented Sep 6, 2024

I jumped the gun on the original recursive directories PR; it was incomplete. This PR fixes that.

Nicholas Coltharp added 5 commits September 5, 2024 13:06
- Only include directories in `citar--library-dirs`.
- `append` the dirs.
- Use `citar--library-dirs` in `citar-file--get-library-files`.
@bdarcus
Copy link
Contributor

bdarcus commented Sep 6, 2024

You have a merge conflict.

@heraplem
Copy link
Author

heraplem commented Sep 6, 2024

Merge conflict fixed.

@bdarcus
Copy link
Contributor

bdarcus commented Sep 6, 2024

Probably better to rebase than merge.

I'll squash the commits though.

@bdarcus bdarcus merged commit 0f1786b into emacs-citar:main Sep 7, 2024
5 of 6 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.

2 participants