Skip to content

W
wicopa
Commit 2e1dc2d5 authored by jlopez's avatar jlopez
Browse files
Options

Fix conflit

parent f729653e
Pipeline #206 passed with stage
    in 43 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 0 additions and 55 deletions
    login.php
    View file @ 2e1dc2d5
    ......@@ -10,61 +10,6 @@ require_once "./inc/php/buildHeader.php";
    ?>
    <<<<<<< HEAD
    =======
    <!doctype html>
    <html lang="en">
    <head>
    <!-- Required meta tags -->
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <!-- Bootstrap CSS -->
    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
    <link rel="stylesheet" href="https://cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css" crossorigin="anonymous">
    <!-- local fallbacks -->
    <!--link rel="stylesheet" href="./inc/css/bootstrap.min.css">
    <link rel="stylesheet" href="./inc/css/jquery.dataTables.min.css"-->
    <link rel="stylesheet" href="./inc/css/style.css">
    <title>wicopa</title>
    </head>
    <body>
    <nav class="navbar navbar-expand-md navbar-dark navbar-custom p-0">
    <a class="navbar-brand" href="#">WICOPA</a>
    <div class="collapse navbar-collapse justify-content-between" id="navbar">
    <div class="navbar-nav justify-content-center">
    <?php
    if(isset($_SESSION['username']) && !empty($_SESSION['username']))
    {
    echo ' <a class="nav-item nav-link" href="./index.php"> Home </a>';
    echo ' <a class="nav-item nav-link" href="./gestion.php"> Gestion </a>';
    }
    ?>
    </div>
    <div class="navbar-nav">
    <?php
    if(isset($_SESSION['username']) && !empty($_SESSION['username']))
    {
    echo '<a class="nav-item btn btn-primary " href="./action/action_logout.php"> Logout ('.$_SESSION['username'].') </a>';
    }
    else
    {
    echo '<a class="nav-item btn btn-primary" href="./login.php"> Login </a>';
    }
    ?>
    </div>
    </nav>
    >>>>>>> f123b4be009adfbfca34a7889a496e1d4a6ec6ff
    <div class="container-fluid">
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment