chore: Removed conflict lines

athul · athul · commit 8fc545289c46 · 2021-12-08T10:31:30.000+05:30
diff --git a/methods/basic.go b/methods/basic.go
@@ -5,11 +5,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-<<<<<<< HEAD
-	"strings"
-=======
 	"os"
->>>>>>> 84d9335cf8a8fede56f25b0c16981965393f5bc5
+	"strings"
 
 	"github.com/urfave/cli"
 )
