mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

Fix merge oops

Browse Source
This commit is contained in:
Leo Franchi
2012-04-15 01:00:52 -03:00
parent 701ef5a69d
commit 5feee4ba75
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
admin/mac/macdeploy.py
View File

@@ -1,5 +1,4 @@
#!/usr/bin/python #!/usr/bin/python
<<<<<<< HEAD
# This file is part of Tomahawk. # This file is part of Tomahawk.
# It was inspired in large part by the macdeploy script in Clementine. # It was inspired in large part by the macdeploy script in Clementine.
# #