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"
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
<<<<<<<< HEAD:cmd/any2anexoj-cli/localizer_test.go
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
========
|
||||
package writing_test
|
||||
|
||||
import (
|
||||
@@ -10,7 +5,6 @@ import (
|
||||
|
||||
"github.com/nmoniz/any2anexoj/internal/writing"
|
||||
)
|
||||
>>>>>>>> 6ba3d78 (writers in writing package):internal/writing/localizer_test.go
|
||||
|
||||
func TestNewLocalizer(t *testing.T) {
|
||||
tests := []struct {
|
||||
@@ -25,11 +19,7 @@ func TestNewLocalizer(t *testing.T) {
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
<<<<<<<< HEAD:cmd/any2anexoj-cli/localizer_test.go
|
||||
_, err := NewLocalizer(tt.lang)
|
||||
========
|
||||
_, err := writing.NewLocalizer(tt.lang)
|
||||
>>>>>>>> 6ba3d78 (writers in writing package):internal/writing/localizer_test.go
|
||||
if err != nil {
|
||||
t.Fatalf("want success call but failed: %v", err)
|
||||
}
|
||||
|
||||
@@ -6,8 +6,6 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/nmoniz/any2anexoj/internal"
|
||||
<<<<<<<< HEAD:cmd/any2anexoj-cli/pretty_printer_test.go
|
||||
========
|
||||
"github.com/nmoniz/any2anexoj/internal/writing"
|
||||
"github.com/nmoniz/any2anexoj/internal/writing/table"
|
||||
"github.com/shopspring/decimal"
|
||||
@@ -52,11 +50,7 @@ func TestPrinter_Render(t *testing.T) {
|
||||
}
|
||||
|
||||
// Create English localizer
|
||||
<<<<<<<< HEAD:cmd/any2anexoj-cli/pretty_printer_test.go
|
||||
localizer, err := NewLocalizer("en")
|
||||
========
|
||||
localizer, err := writing.NewLocalizer("en")
|
||||
>>>>>>>> 6ba3d78 (writers in writing package):internal/writing/pretty/printer_test.go
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create localizer: %v", err)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user