diff options
| author | Steve Manuel <nilslice@gmail.com> | 2016-12-19 13:01:33 -0800 |
|---|---|---|
| committer | Steve Manuel <nilslice@gmail.com> | 2016-12-19 13:01:33 -0800 |
| commit | 25483782e43cc996548dcb018d7a34e683f77796 (patch) | |
| tree | b638ff86c46e5c9eb9663093ebb66a00896aa0e0 /cmd/ponzu/options.go | |
| parent | 735daecd2ed792bd2aab878fd04928db590dcb04 (diff) | |
fixing left over merge conflicts
Diffstat (limited to 'cmd/ponzu/options.go')
| -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 |