From 87980c10203a7917ab8d376d4b6e33f1aaecda80 Mon Sep 17 00:00:00 2001
From: Gopinath Langote <gopinathlangote11@gmail.com>
Date: Wed, 21 Aug 2019 19:02:59 +0200
Subject: [PATCH] Go mod fix

---
 go.mod | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/go.mod b/go.mod
index 65bf69e1..625d5684 100644
--- a/go.mod
+++ b/go.mod
@@ -10,16 +10,12 @@ require (
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.3
-<<<<<<< HEAD
 	github.com/stretchr/testify v1.4.0
-=======
-	github.com/stretchr/testify v1.3.0
 	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
 	golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
 	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
 	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
 	golang.org/x/text v0.3.2 // indirect
 	golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // indirect
->>>>>>> Lint fix
 	gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
 )