forked from lbsadmin/nodeMessageBoard
merge
This commit is contained in:
@ -76,7 +76,7 @@ body {
|
||||
location.reload();
|
||||
});
|
||||
|
||||
iosocket.on('onconnection', function() {
|
||||
iosocket.on('connect', function() {
|
||||
|
||||
|
||||
|
||||
@ -160,7 +160,12 @@ body {
|
||||
<div id="debugOut"> </div>
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<!-- <div id="footer">
|
||||
=======
|
||||
<!--
|
||||
<div id="footer">
|
||||
>>>>>>> 754c9a7bd9436bf6309b8a11822ff7b2e3014aee
|
||||
<h2>Send an SMS with a message to <span class="number" style="color:#3399ff;"></span></h2>
|
||||
</div>
|
||||
-->
|
||||
|
Reference in New Issue
Block a user