fix(conflict): conflict resolution

This commit is contained in:
vicente1992
2022-12-15 00:25:13 -05:00
111 changed files with 3726 additions and 1404 deletions

View File

@@ -5,6 +5,9 @@
"cli",
"bot",
"provider",
"adapter"
"adapter",
"ci",
"starters",
"conflict"
]
}