Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier
_commit: 5.0.2
_commit: 5.0.3
_src_path: https://github.com/DiamondLightSource/python-copier-template.git
author_email: l.haddad@diamond.ac.uk
author_name: Lucy Haddad
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua

This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.

For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.2/how-to.html).
For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.3/how-to.html).
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ A python package for processing and analysis of X-ray spectroscopy data
This is where you should write a short paragraph that describes what your module does,
how it does it, and why people should use it.

<<<<<<< before updating
Source | <https://github.com/DiamondLightSource/xas_toolbox>
:---: | :---:
Releases | <https://github.com/DiamondLightSource/xas_toolbox/releases>
=======
What | Where
:---: | :---:
Source | <https://github.com/DiamondLightSource/xas-toolbox>
Releases | <https://github.com/DiamondLightSource/xas-toolbox/releases>
>>>>>>> after updating

This is where you should put some images or code snippets that illustrate
some relevant examples. If it is a library then you might put some
Expand Down
Loading