fix merge conflict

data/interfaces/default/searchresults.html

@@ -55,7 +55,6 @@
                     <td id="score"><a href="${result['url']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
                     <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['url']}"><img src="interfaces/default/images/MusicBrainz_Artist_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
 				%endif
-
 				</tr>
 				%endfor
 			%endif
@@ -71,10 +70,10 @@
 <%def name="javascriptIncludes()">
 
 	<script src="js/libs/jquery.dataTables.min.js"></script>
-	
+
 	<script>
 	function getArt() {
-		$("table#searchresults_table tr td#albumart img").each(function(){	
+		$("table#searchresults_table tr td#albumart img").each(function(){
 			var id = $(this).attr('title');
 			var image = $(this);
 			if ( !image.hasClass('done') ) {
@@ -90,7 +89,7 @@
 				"bDestroy": true,
 				"aoColumnDefs": [
 			          { 'bSortable': false, 'aTargets': [ 0 ] }
-				],	
+				],
 				"oLanguage": {
 					"sLengthMenu":"Show _MENU_ results per page",
 					"sEmptyTable": "No results",