Parametryzacja "muzyki mojego ludu"

.trunk/.gitignore

@@ -6,4 +6,8 @@
 plugins
 user_trunk.yaml
 user.yaml
+<<<<<<< HEAD
 tmp
+=======
+tools
+>>>>>>> c7dc465 (Parametryzacja "muzyki mojego ludu")

.trunk/trunk.yaml

@@ -2,6 +2,7 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
+<<<<<<< HEAD
   version: 1.20.1
 # Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
 plugins:
@@ -10,10 +11,44 @@ plugins:
       ref: v1.4.5
       uri: https://github.com/trunk-io/plugins
 # Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
+=======
+  version: 1.12.1
+plugins:
+  sources:
+    - id: trunk
+      ref: v0.0.22
+      uri: https://github.com/trunk-io/plugins
+lint:
+  enabled:
+    - actionlint@1.6.25
+    - markdownlint@0.35.0
+    - trivy@0.43.1
+    - trufflehog@3.44.0
+    - pylint
+    - codespell
+    - cspell
+    - git-diff-check
+    - eslint
+    - prettier
+    - semgrep
+    - autopep8
+    - bandit
+    - black
+    - flake8
+    - isort
+    - mypy
+    - pylint
+    - ruff
+    - semgrep
+    - yapf
+    - gitleaks
+
+>>>>>>> c7dc465 (Parametryzacja "muzyki mojego ludu")
 runtimes:
   enabled:
     - node@18.12.1
     - python@3.10.8
+<<<<<<< HEAD
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
   enabled:
@@ -31,6 +66,8 @@ lint:
     - trivy@0.50.1
     - trufflehog@3.71.0
     - yamllint@1.35.1
+=======
+>>>>>>> c7dc465 (Parametryzacja "muzyki mojego ludu")
 actions:
   disabled:
     - trunk-announce