updated readme and fixed bad conflict resolution
Generate check / check-changes (pull_request) Successful in 2s
Generate check / verify-generate (pull_request) Skipped
Quality / check-changes (pull_request) Successful in 3s
Quality / static-checks (pull_request) Successful in 55s
Quality / run-tests (pull_request) Successful in 55s
Generate check / check-changes (pull_request) Successful in 2s
Generate check / verify-generate (pull_request) Skipped
Quality / check-changes (pull_request) Successful in 3s
Quality / static-checks (pull_request) Successful in 55s
Quality / run-tests (pull_request) Successful in 55s
This commit is contained in:
1 parent
5c146ad60f
commit
4384f28df9
4 files changed
+8
-22
No files matched your search
@@ -1,8 +1,4 @@
|
||||
<<<<<<<< HEAD:cmd/any2anexoj-cli/localizer.go
|
||||
package main
|
||||
========
|
||||
package writing
|
||||
>>>>>>>> 6ba3d78 (writers in writing package):internal/writing/localizer.go
|
||||
|
||||
import (
|
||||
"embed"
|
||||
|
||||
Reference in new issue
Block a user