From 0492c711cc4f2c76ac48193649862026db241133 Mon Sep 17 00:00:00 2001
From: Manveer Basra <m13basra@gmail.com>
Date: Mon, 29 Oct 2018 13:11:05 -0400
Subject: [PATCH] Refactored for consistency

---
 spotdl/handle.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/spotdl/handle.py b/spotdl/handle.py
index f4168fd..f76f46c 100644
--- a/spotdl/handle.py
+++ b/spotdl/handle.py
@@ -5,10 +5,6 @@ import logging
 import yaml
 import argparse
 import mimetypes
-<<<<<<< HEAD
-=======
-
->>>>>>> --list flag accepts only text files using mimetypes
 import os
 
 import spotdl