1 files changed, 0 insertions, 1 deletions
diff --git a/music.cpp b/music.cpp
index 712a461..8a28965 100644
--- a/music.cpp
+++ b/music.cpp
@@ -169,7 +169,6 @@ MusicDirectory::MusicDirectory(const fs::path root) {
 }
 
 void MusicTrack::render(HTTP::Connection::p req) {
-<<<<<<< HEAD
 	req->add_header("Content-Type", "audio/mpeg");
 	fs::path file_path = path;