From 9e0ce2f2d0ed422120ea2abe85890a132c61e2c1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 15 Feb 2026 05:50:12 +0000
Subject: [PATCH 1/2] Update from copier (2026-02-15T05:50:12)

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 .copier-answers.yaml |  2 +-
 pyproject.toml       | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.copier-answers.yaml b/.copier-answers.yaml
index 3a6e16a..c290c6c 100644
--- a/.copier-answers.yaml
+++ b/.copier-answers.yaml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: b74d698
+_commit: 37f89c1
 _src_path: https://github.com/python-project-templates/base.git
 add_docs: false
 add_extension: python
diff --git a/pyproject.toml b/pyproject.toml
index 19fb280..d666023 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,11 @@
 requires = [
     "hatchling",
 ]
+<<<<<<< before updating
 build-backend = "hatchling.build"
+=======
+build-backend="hatchling.build"
+>>>>>>> after updating
 
 [project]
 name = "yardang"
@@ -70,6 +74,7 @@ develop = [
     "pytest-cov",
     "ruff>=0.9,<0.15",
     "twine",
+    "ty",
     "uv",
     "wheel",
 ]
@@ -130,19 +135,25 @@ src = "/"
 packages = [
     "yardang",
 ]
+<<<<<<< before updating
 exclude = [
     "docs/*",
     "examples/*",
 ]
+=======
+>>>>>>> after updating
 
 [tool.hatch.build.targets.wheel]
 packages = [
     "yardang",
 ]
+<<<<<<< before updating
 exclude = [
     "docs/*",
     "examples/*",
 ]
+=======
+>>>>>>> after updating
 
 [tool.hatch.build.targets.wheel.shared-data]
 
@@ -180,6 +191,7 @@ section-order = [
     "F401",
     "F403",
 ]
+<<<<<<< before updating
 
 [tool.yardang]
 root = "docs/src/home.md"
@@ -214,3 +226,5 @@ generate-footer = true
 footer-docs-url = "https://yardang.python-templates.dev"
 footer-repo-url = "https://github.com/python-project-templates/yardang"
 markdown-flavor = "github"
+=======
+>>>>>>> after updating

From 0eb801ddde3f860cfd124c94c7c4ce11eaf2af17 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Sun, 15 Feb 2026 11:02:52 -0500
Subject: [PATCH 2/2] Fix merge conflicts in pyproject.toml

Removed merge conflict markers and cleaned up formatting.
---
 pyproject.toml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index d666023..eb89905 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,11 +2,7 @@
 requires = [
     "hatchling",
 ]
-<<<<<<< before updating
 build-backend = "hatchling.build"
-=======
-build-backend="hatchling.build"
->>>>>>> after updating
 
 [project]
 name = "yardang"
@@ -135,25 +131,19 @@ src = "/"
 packages = [
     "yardang",
 ]
-<<<<<<< before updating
 exclude = [
     "docs/*",
     "examples/*",
 ]
-=======
->>>>>>> after updating
 
 [tool.hatch.build.targets.wheel]
 packages = [
     "yardang",
 ]
-<<<<<<< before updating
 exclude = [
     "docs/*",
     "examples/*",
 ]
-=======
->>>>>>> after updating
 
 [tool.hatch.build.targets.wheel.shared-data]
 
@@ -191,7 +181,6 @@ section-order = [
     "F401",
     "F403",
 ]
-<<<<<<< before updating
 
 [tool.yardang]
 root = "docs/src/home.md"
@@ -226,5 +215,3 @@ generate-footer = true
 footer-docs-url = "https://yardang.python-templates.dev"
 footer-repo-url = "https://github.com/python-project-templates/yardang"
 markdown-flavor = "github"
-=======
->>>>>>> after updating