Fixed merged conflicts with postprocessing merge from echel0n, fixed some tabs->whitespace, fixed screwed up merge conflict resolution from pushalot merge

This commit is contained in:
rembo10
2014-02-27 18:16:20 -08:00
4 changed files with 26 additions and 23 deletions

View File

@@ -507,6 +507,11 @@
<input type="checkbox" name="embed_album_art" value="1" ${config['embed_album_art']}><label>Embed album art in each file</label>
<input type="checkbox" name="embed_lyrics" value="1" ${config['embed_lyrics']}><label>Embed lyrics</label>
</div>
<div class="row">
<label>Path to Post-Processing Folder</label>
<input type="text" name="post_processing_dir" value="${config['post_processing_dir']}" size="50">
<small>Set this to where your download client puts its completed downloads in</small>
</div>
<div class="row">
<label>Path to Destination Folder</label>
<input type="text" name="destination_dir" value="${config['dest_dir']}" size="50">