diff --git a/index.php b/index.php
index a059198..2551860 100644
--- a/index.php
+++ b/index.php
@@ -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);
@@ -112,7 +107,7 @@ $librerias_pie ="";
 //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
 if (isset($_REQUEST['empresa'])) {
 
-
+		
 	$variable = "e".$_REQUEST['empresa'];
 
 }
@@ -567,11 +562,11 @@ if ($variable !=''){
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-
+	  		
 	  		.control_planilla{
 	  		display:none
 	  		}
-
+	  		
 	  		</style>
 	  		 <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
 	  		 <script src='./librerias/charts/Chart.bundle.js'></script>
@@ -689,7 +684,7 @@ if('serviceWorker' in navigator) {
 							<div class='container-fluid'>
 								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
 								<br>
-<table class='table table-bordered table-striped exportable'>
+<table class='table table-bordered table-striped exportable'> 
 <thead></thead>
 <tbody style=' ' id='scroll-galeria' >
 </tbody>
@@ -711,25 +706,9 @@ if('serviceWorker' in navigator) {
 			$estadisticas = portal_listado_campos("$form");
 			$acciones= formulario_acciones("$form","aplicacion");
 			$no_mostrar="display:none; ";
-
+		
 			$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
 
 
 
@@ -790,7 +768,7 @@ $acciones
 								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
 <br>
 <div class=''>
-<table class='table table-bordered table-striped exportable'>
+<table class='table table-bordered table-striped exportable'> 
 <thead>$titulos</thead>
 <tbody style=' ' id='scroll-content' >
 </tbody>
@@ -1043,7 +1021,7 @@ $aplicacion_pie="
 							$banner
 
 							</div>
-
+							
 								<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
 									 <div class='navbar-header'>
 										  <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@@ -1071,7 +1049,7 @@ $aplicacion_pie="
 								</div>
 								<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
 								$presentacion
-
+							
 
 
 	  		<script>
@@ -1240,7 +1218,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  if(isset($_SESSION['id'])){
 	 $form_tiempo_session = "
     <li>
-
+		
 	</li> ";  } else{ $form_tiempo_session = "";}
  if($tema=="") {
 
@@ -1334,7 +1312,7 @@ else {
  <!-- iOS Safari -->
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
-
+  
 	";
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");