fix: Merge conflicts

This commit is contained in:
olivermrbl committed 2022-07-12 09:29:41 +02:00
commit fb0346f1fa
418 files changed
+74357 -14856

No files matched your search

+5 -1
View File
@@ -1,5 +1,9 @@
name: CLI Pipeline
on: [pull_request]
on:
pull_request:
paths-ignore:
- "docs/**"
- "www/**"
jobs:
test-cli-with-database: