From dd62185d31b2967a98a1fa58bf869db46ab8284b Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Wed, 2 Mar 2011 22:37:34 +0100 Subject: derp --- music.cpp | 1 - 1 file changed, 1 deletion(-) 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; -- cgit v1.2.3