Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflit

This commit is contained in:
denise 2012-06-05 14:47:11 -04:00
parent 35be145043
commit 5966c7feda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
View File

@ -74,7 +74,7 @@
</dd> </dd>
<?php } ?> <?php } ?>
<dt id="master_dj_connection_url-label"> <dt id="master_dj_connection_url-label">
<label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL: <label class="optional" for="master_dj_connection_url" style="white-space: nowrap"><?php echo $this->element->getElement('master_dj_connection_url')->getLabel() ?> :
</label> </label>
</dt> </dt>
<dd id="master_dj_connection_url-element"> <dd id="master_dj_connection_url-element">
@ -117,7 +117,7 @@
</dd> </dd>
<?php } ?> <?php } ?>
<dt id="live_dj_connection_url-label"> <dt id="live_dj_connection_url-label">
<label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL: <label class="optional" for="live_dj_connection_url" style="white-space: nowrap"><?php echo $this->element->getElement('live_dj_connection_url')->getLabel() ?> :
</label> </label>
</dt> </dt>
<dd id="live_dj_connection_url-element"> <dd id="live_dj_connection_url-element">