Removed merge headers

This commit is contained in:
RemixDev 2020-05-10 15:03:03 +02:00
parent 05b940b84f
commit 9b8f83336a

View File

@ -307,11 +307,7 @@ <h3 class="section_heading">Most streamed albums</h3>
class="material-icons">get_app</i></div> class="material-icons">get_app</i></div>
</div> </div>
<p class="primary-text">{{ release.title }}</p> <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>
=======
<p class="secondary-text">{{ 'by '+release.artist.name+' }}</p>
>>>>>>> b1d931b75e62f341f7ce468680175bcf1ccdc7d1
</div> </div>
</div> </div>
</section> </section>