chore(deps): update dependency https://github.com/dafyddj/copier-boot…

…strap to v2.6.0
dafyddj · Dec 31, 2024 · 4a1c048 · 4a1c048
1 parent 69543d8
commit 4a1c048
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,4 +1,4 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v2.5.0
+_commit: v2.6.0
 _src_path: https://github.com/dafyddj/copier-bootstrap
 template_name: copier-packer-build
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -0,0 +1,6 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository for all available settings.
+
+  allow_squash_merge: false
diff --git a/template/.github/settings.yml b/template/.github/settings.yml
@@ -0,0 +1,6 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository for all available settings.
+
+  allow_squash_merge: false
diff --git a/test/GenerateProject/catalogue.tt b/test/GenerateProject/catalogue.tt
@@ -3,6 +3,7 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+<<<<<<< before updating
 --------workflows
 ------------libbuild.yml
 ----.gitignore
@@ -15,3 +16,6 @@ The following new files/directories were created:
 ----root.mk
 ----upload
 --------main.pkr.hcl
+=======
+--------settings.yml
+>>>>>>> after updating