Update project.toml from template

Author: vib-adhoc

.copier-answers.yml

@@ -1,5 +1,5 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: 2f2f7c4
+_commit: a740779
 _src_path: https://github.com/ingadhoc/addons-repo-template.git
 description: ADHOC Odoo odoo-argentina Modules
 is_private: false

.github/workflows/pre-commit.yml

@@ -6,8 +6,13 @@ name: pre-commit
 
 on:
   push:
-    branches: "[0-9][0-9].0"
+    branches:
+      - "1[8-9].0"
+      - "[2-9][0-9].0"
   pull_request_target:
+    branches:
+      - "1[8-9].0*"
+      - "[2-9][0-9].0*"
 
 jobs:
   pre-commit:

.pre-commit-config.yaml

@@ -29,6 +29,8 @@ repos:
       - id: check-docstring-first
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
+        args: ['--assume-in-merge']
+        exclude: '\.rst$'
       - id: check-symlinks
       - id: check-xml
       - id: check-yaml