diff options
| -rw-r--r-- | cmd/ponzu/options.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go index 841af94..e1e432f 100644 --- a/cmd/ponzu/options.go +++ b/cmd/ponzu/options.go @@ -250,11 +250,8 @@ func buildPonzuServer(args []string) error { // copy all ./content files to internal vendor directory src := "content" -<<<<<<< HEAD dst := filepath.Join("cmd", "ponzu", "vendor", "github.com", "ponzu-cms", "ponzu", "content") -======= - dst := filepath.Join("cmd", "ponzu", "vendor", "github.com", "bosssauce", "ponzu", "content") ->>>>>>> ponzu-dev + err = copyFilesWarnConflicts(src, dst, []string{"doc.go"}) if err != nil { return err |