Skip to content

Commit 161958a

Browse files
authored
Merge pull request #8 from Kvnbbg/feature/architecture-guide-alignment
Fix: Resolve CI build failures
2 parents a3b7835 + 7c55ad7 commit 161958a

File tree

3 files changed

+1
-879
lines changed

3 files changed

+1
-879
lines changed

.trunk/trunk.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ runtimes:
1818
# This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
1919
lint:
2020
enabled:
21-
<<<<<<< HEAD
2221
23-
=======
24-
>>>>>>> 5d3022ace5df3363aadb20e7a42864364f0dce68
2522
2623
2724

0 commit comments

Comments
 (0)