Removed merge headers

2020-05-10 15:03:03 +02:00 · 2020-05-10 15:03:03 +02:00 · 9b8f83336a
commit 9b8f83336a
parent 05b940b84f
1 changed files with 0 additions and 4 deletions
--- a/public/index.html
+++ b/public/index.html
@ -307,11 +307,7 @@ <h3 class="section_heading">Most streamed albums</h3>
 													class="material-icons">get_app</i></div>
 										</div>
 										<p class="primary-text">{{ release.title }}</p>
-<<<<<<< HEAD
 										<p class="secondary-text">{{ 'by '+release.artist.name }}</p>
-=======
-										<p class="secondary-text">{{ 'by '+release.artist.name+' }}</p>
->>>>>>> b1d931b75e62f341f7ce468680175bcf1ccdc7d1
 									</div>
 								</div>
 							</section>