Skip to content

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

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.

Sign up for GitHub

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

Merged
sbillinge merged 1 commit into from
Dec 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AUTHORS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Authors
=======
====================
Copy link
Contributor

@sbillinge sbillinge Dec 1, 2022

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
Contributor Author

@chloeann95 chloeann95 Dec 1, 2022

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


Christopher L. Farrow, Christopher James Wright, Pavol Juhas,
Chia-Hao (Timothy) Liu, Timur Davis, S. Matthew Román, Simon J.L.
Expand All @@ -8,4 +8,4 @@ Billinge
Contributors
------------
For a list of contributors, visit
https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors
5 changes: 1 addition & 4 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,4 @@ v0.0.1

**Changed:**

* Fixed rever GH address



* Fixed rever GH address
Copy link
Contributor

@sbillinge sbillinge Dec 1, 2022

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
Contributor Author

@chloeann95 chloeann95 Dec 1, 2022

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
Contributor Author

@chloeann95 chloeann95 Dec 1, 2022

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