mirror of
https://gitlab.com/RemixDev/deemix-webui.git
synced 2025-01-21 05:41:45 +00:00
Removed merge headers
This commit is contained in:
parent
05b940b84f
commit
9b8f83336a
|
@ -307,11 +307,7 @@
|
||||||
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>
|
||||||
|
|
Loading…
Reference in a new issue