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

Docstrings for cutoff_menu and LCA_results_tabs #349

Merged
merged 11 commits into from
Jan 10, 2020
Merged

Docstrings for cutoff_menu and LCA_results_tabs #349

merged 11 commits into from
Jan 10, 2020

Conversation

marc-vdm
Copy link
Member

@marc-vdm marc-vdm commented Jan 9, 2020

Docstrings updated/made in accordance with PEP8 and PEP257 for cutoff_menu and LCA_results_tabs
as recently proposed in #346.
Some commits from other users [or my lack of understanding git :D] are now under my name and I don't know why though. Please let me know if you know a way to fix that, I`m not here to claim credit for work I didnt do.

@dgdekoning
Copy link
Contributor

I really like this! Thank you for adding clear explanations of what is shown by each different LCA result tab.

I think I see what you mean about the commits, it looks like you've continued working on the same branch that was merged in #345. I'm not sure if there is a clean way of fixing this.
What I usually do when I find myself with something like this is storing the changed code somewhere and undoing commits until I reach a place where a fast-forward merge can be done. Though that can be a lot of work.

@marc-vdm
Copy link
Member Author

marc-vdm commented Jan 9, 2020

Happy to have done the work, someone had to, and as I partly wrote that code, I thought I should.
Ive looked at the commit business again, I think it should all be fine now, my master fork should now be in line with this master, so long as I keep fetching/pulling properly from here I think we should be fine!

@dgdekoning
Copy link
Contributor

I'll be merging this sometime later today or tomorrow, this has given me ideas while I was planning to work on something else.

@dgdekoning dgdekoning merged commit c710d6d into LCA-ActivityBrowser:master Jan 10, 2020
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