Skip to content

Commit

Permalink
fix imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Marlon Pina Tojal committed Nov 3, 2023
1 parent bca5d91 commit d591ec6
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion flatmerge/merge.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package flatmerge

import (
"cyclonedx-merge/utils"
"github.com/fnxpt/cyclonedx-merge/utils"

"github.com/CycloneDX/cyclonedx-go"
)
7 changes: 4 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package main

import (
"cyclonedx-merge/flatmerge"
"cyclonedx-merge/merge"
"cyclonedx-merge/utils"
"flag"
"fmt"
"io"
"os"
"strings"

"github.com/fnxpt/cyclonedx-merge/flatmerge"
"github.com/fnxpt/cyclonedx-merge/merge"
"github.com/fnxpt/cyclonedx-merge/utils"

"github.com/CycloneDX/cyclonedx-go"
)

2 changes: 1 addition & 1 deletion merge/merge.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package merge

import (
"cyclonedx-merge/utils"
"github.com/fnxpt/cyclonedx-merge/utils"

"github.com/CycloneDX/cyclonedx-go"
)
2 changes: 1 addition & 1 deletion smartmerge/merge.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package smartmerge

import (
"cyclonedx-merge/utils"
"github.com/fnxpt/cyclonedx-merge/utils"

"github.com/CycloneDX/cyclonedx-go"
)

0 comments on commit d591ec6

Please sign in to comment.