From 126519f5a5d663fea2509f6bf8d3511400053aca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 Apr 2026 17:52:07 +0000 Subject: [PATCH] Update dependency https://github.com/DiamondLightSource/python-copier-template to v5.0.3 --- .copier-answers.yml | 2 +- .github/CONTRIBUTING.md | 2 +- README.md | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 81b8823b68e..491744e8c03 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -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 author_email: dominic.oram@diamond.ac.uk author_name: Dominic Oram diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 0ffed58a5e7..5f72174e676 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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). diff --git a/README.md b/README.md index 05e129e5bcf..e73d22b92a7 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,12 @@ Ophyd devices and other utils that could be used across DLS beamlines +<<<<<<< before updating +======= +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. + +>>>>>>> after updating What | Where :---: | :---: Source |