qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

fetch con directorio remoto corriguiendo conflicto

Browse Source
This commit is contained in:
Hacky Purple 2018-04-21 13:35:32 -05:00
parent 790bcf86f4
commit 0142691cfe
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.php
View File

@ -1361,13 +1361,10 @@ echo $css_adicional;
<div class="col-md-9"> <div class="col-md-9">
<div id='formulario_login' class='' ></div> <div id='formulario_login' class='' ></div>
<<<<<<< HEAD
<div class='container' div='contenedor_cabecera'>
<div class='col-md-3' id='logo_cabecera'>
=======
<div class='container' id='contenedor_cabecera'> <div class='container' id='contenedor_cabecera'>
<div class='col-sm-12 col-md-3' id='logo_cabecera'> <div class='col-sm-12 col-md-3' id='logo_cabecera'>
>>>>>>> 8eca1b220dbaecbb61b41974573b70a4d8ee8bea
<a href="./e<?php echo $id_empresa; ?>"> <a href="./e<?php echo $id_empresa; ?>">
<img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>"> <img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>">
</a> </a>