Fixed merge conflicts

This commit is contained in:
paul.baranowski 2011-02-14 13:16:57 +01:00
commit b6d117d456
4 changed files with 14 additions and 14 deletions

View file

@ -5,8 +5,8 @@
<ol>
<li>Add your files to the library using the "Add Audio" button. You can drag and drop your files to this window too. </li>
<li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.</li>
<li>Create a playlist in the Playlist Builder menu using your audio files. </li>
<li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins can add shows.</li>
<li>Add the playlist to the show by going to your show in the Schedule calendar, right-clicking on it and selecting "Add Content." </li>
<li>Select your playlist and drag and drop it to the "Items in this show" area.</li>
</ol>