From 5feee4ba75f4c71cb64024456bb4fe2fd6106ed8 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 15 Apr 2012 01:00:52 -0300
Subject: [PATCH] Fix merge oops

---
 admin/mac/macdeploy.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py
index 8e1f83370..71bdefb77 100755
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-<<<<<<< HEAD
 #  This file is part of Tomahawk. 
 #  It was inspired in large part by the macdeploy script in Clementine.
 #