Actualizand

This commit is contained in:
Hacky Purple 2018-11-02 14:49:55 -05:00
parent cc86a63c3e
commit 640e8bf956

View File

@ -33,13 +33,8 @@
<meta name='apple-mobile-web-app-capable' content='yes'/>
<meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
<!-- Chrome, Firefox OS y Opera -->
<<<<<<< HEAD
<script type="text/javascript">
=======
<link rel='stylesheet' href='./librerias/animate/animate.min.css'>
<script type="text/javascript">
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
window.addEventListener("load",function() {
setTimeout(function(){
window.scrollTo(0, 1);
@ -714,22 +709,6 @@ if('serviceWorker' in navigator) {
$footer="
<<<<<<< HEAD
<nav class='navbar navbar-inverse navbar-fixed-bottom'>
<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
<ul class='nav navbar-nav center-block' style='
float:none;
margin:0 auto;
display: block;
text-align: center;'>
$acciones
</ul>
</div>
</nav>";
=======
<nav class='navbar navbar-default navbar-fixed-bottom'>
<div class='container-fluid'>
@ -754,7 +733,6 @@ $acciones
</div>
</nav>";
>>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861