From f2171812931114dc48a9d27122a8479af8b2c8f3 Mon Sep 17 00:00:00 2001
From: Matthew Holt <mholt@users.noreply.github.com>
Date: Mon, 15 Jul 2019 17:33:08 -0600
Subject: [PATCH] mod: Use blackfriday's standard v2 module import path

---
 go.mod                                    | 4 +---
 modules/caddyhttp/markdown/markdown.go    | 2 +-
 modules/caddyhttp/templates/tplcontext.go | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 8f015549..bf9e2486 100644
--- a/go.mod
+++ b/go.mod
@@ -19,13 +19,11 @@ require (
 	github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2
 	github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
 	github.com/rs/cors v1.6.0
+	github.com/russross/blackfriday/v2 v2.0.1
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/starlight-go/starlight v0.0.0-20181207205707-b06f321544f3
 	go.starlark.net v0.0.0-20190604130855-6ddc71c0ba77
 	golang.org/x/net v0.0.0-20190603091049-60506f45cf65
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
-	gopkg.in/russross/blackfriday.v2 v2.0.1
 	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
-
-replace gopkg.in/russross/blackfriday.v2 v2.0.1 => github.com/russross/blackfriday/v2 v2.0.1
diff --git a/modules/caddyhttp/markdown/markdown.go b/modules/caddyhttp/markdown/markdown.go
index b9a2a915..3ba4d029 100644
--- a/modules/caddyhttp/markdown/markdown.go
+++ b/modules/caddyhttp/markdown/markdown.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"sync"
 
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday/v2"
 
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
diff --git a/modules/caddyhttp/templates/tplcontext.go b/modules/caddyhttp/templates/tplcontext.go
index 548b3e13..ffcc636a 100644
--- a/modules/caddyhttp/templates/tplcontext.go
+++ b/modules/caddyhttp/templates/tplcontext.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/Masterminds/sprig"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday/v2"
 )
 
 // templateContext is the templateContext with which HTTP templates are executed.