From ce5e1b4934e6ec7f54d82a400ec77e6152b5e789 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano@smallstep.com>
Date: Fri, 28 Aug 2020 14:44:43 -0700
Subject: [PATCH] Fix merge issue.

---
 authority/tls_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/authority/tls_test.go b/authority/tls_test.go
index d9f1f6d4..e96a4bd9 100644
--- a/authority/tls_test.go
+++ b/authority/tls_test.go
@@ -481,7 +481,7 @@ ZYtQ9Ot36qc=
 				NotAfter:  now.Add(365 * 24 * time.Hour),
 			}}
 			_a := testAuthority(t)
-			_a.config.AuthorityConfig.Template = &x509util.ASN1DN{}
+			_a.config.AuthorityConfig.Template = &ASN1DN{}
 			_a.db = &db.MockAuthDB{
 				MStoreCertificate: func(crt *x509.Certificate) error {
 					assert.Equals(t, crt.Subject, pkix.Name{})