feat(merge_component): ✨ Add merge from website
Merge contents from patch selected by user into newer version merge from client feature
This commit is contained in:
parent
292c7697a4
commit
09c21301d6
15 changed files with 343 additions and 42 deletions
|
|
@ -19,7 +19,7 @@ func main() {
|
|||
config, err := loadConfig(".")
|
||||
|
||||
if err != nil {
|
||||
// TODO: use default config instead
|
||||
// use default config instead
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue