Skip to content

fixed leftover conflict marker and blank line EOF errors, trailing wh…#53

Merged
sbillinge merged 1 commit into
diffpy:masterfrom
chloeann95:issue42
Dec 1, 2022
Merged

fixed leftover conflict marker and blank line EOF errors, trailing wh…#53
sbillinge merged 1 commit into
diffpy:masterfrom
chloeann95:issue42

Conversation

@chloeann95

Copy link
Copy Markdown
Contributor

…itespaces all removed closes #42

@sbillinge sbillinge left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please see inline comments

Comment thread CHANGELOG.rst



* Fixed rever GH address No newline at end of file

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be a bugfix not a change. Changes are for changed functionality

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was what was already there, I can add an additional line for a bug fix

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe the changelog has been maintained in keeping up with PRs

Comment thread AUTHORS.rst
@@ -1,5 +1,5 @@
Authors
=======
====================

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check whether this breaks the compiled build and report back....I thought that the number of underscores/whatever had to match the number of letters, but I am not sure.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the pycharm preview it looks fine which I believe shows the compiled version and elsewhere we have an entire row of "=" for smaller titles
Screen Shot 2022-12-01 at 3 56 56 PM

@sbillinge sbillinge merged commit 61dffb8 into diffpy:master Dec 1, 2022
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.

whitespace errors

2 participants