mirrors/deemix-webui
1
0
Fork 0
mirror of https://gitlab.com/RemixDev/deemix-webui.git synced 2025-01-04 05:46:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed merge headers

Browse source
This commit is contained in:
RemixDev 2020-05-10 15:03:03 +02:00
parent 05b940b84f
commit 9b8f83336a
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/index.html
View file

@ -307,11 +307,7 @@
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>