hq/basspistol.com
hq/basspistol.com
4
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

resolve conflicts

Browse source
This commit is contained in:
Set Sakrecoer 2019-06-19 16:36:59 +02:00
parent 40ca9f7fb4
commit d53c344a70
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -87,11 +87,7 @@ poster_image: /assets/vid/intro_loop_.jpg
<a href="{{ base }}{{ page.url }}" title="{{ page.title }}"><div class="highlights" style="background-image: url('{{ base }}{{ page.image }}')">
</div><h3>{{ page.title }} </h3></a>
<p class="editable">
<<<<<<< HEAD
Highlights are music-things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
=======
Highlights are things we think you want to discover. Tracks, articles, videos, interviews and reviews, curated but also original content. They are delivered to you daily. Here or via RSS.
>>>>>>> content
</p>
{% endfor %}