resolved merge conflict
This commit is contained in:
parent
180770f28e
commit
11cd870fde
@ -16,7 +16,7 @@
|
|||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section id="tool-bar">
|
<section id="tool-bar">
|
||||||
<select id="sort-btn" title="Sort entries">Sort by
|
<select id="sort-btn" class="btn flat" title="Sort entries">Sort by
|
||||||
<option>Author A-Z</option>
|
<option>Author A-Z</option>
|
||||||
<option>Author Z-A</option>
|
<option>Author Z-A</option>
|
||||||
<option>Title A-Z</option>
|
<option>Title A-Z</option>
|
||||||
|
Loading…
Reference in New Issue
Block a user