git-repoZSI/index.html

<!doctype html>
<html class="no-js" lang="">
    <head>
        <meta charset="utf-8">
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <meta name="description" content="">
        <meta name="viewport" content="width=device-width, initial-scale=1">
        <link rel="stylesheet" href="css/bootstrap.css">
        <link rel="stylesheet" href="css/main.css">
        <title>Template</title>
    </head>
    <body>
    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
      <div class="container">
        <div class="navbar-header">
          <a class="navbar-brand" href="#">Page name</a>
        </div>

      </div>
    </nav>

    <div class="jumbotron">
      <div class="container">
        <h1>Hello, world!</h1>
      </div>
    </div>

    <div class="container">
      <div class="row">
        <div class="col-md-4">
          <h2>Heading 1</h2>
          <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
          <p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
          <p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
        </div>
        <div class="col-md-4">
          <h2>Heading 2</h2>
          <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
          <p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
          <p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
       </div>
        <div class="col-md-4">
          <h2>Heading 3</h2>
          <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<<<<<<< HEAD
          <p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
          <p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
        </div>
      </div>
    </div>

    </body>
    <footer> 
      <div class="container"> 
        <hr /> 
        KPI TUKE 
      </div> 
    </footer>
    
</html>
prvy commit 2023-02-20 09:39:00 +00:00			`<!doctype html>`
			`<html class="no-js" lang="">`
			`<head>`
			`<meta charset="utf-8">`
			`<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">`
			`<meta name="description" content="">`
			`<meta name="viewport" content="width=device-width, initial-scale=1">`
			`<link rel="stylesheet" href="css/bootstrap.css">`
			`<link rel="stylesheet" href="css/main.css">`
			`<title>Template</title>`
			`</head>`
			`<body>`
			`<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">`
			`<div class="container">`
			`<div class="navbar-header">`
			`<a class="navbar-brand" href="#">Page name</a>`
			`</div>`

			`</div>`
			`</nav>`

			`<div class="jumbotron">`
			`<div class="container">`
			`<h1>Hello, world!</h1>`
			`</div>`
			`</div>`

			`<div class="container">`
			`<div class="row">`
			`<div class="col-md-4">`
			`<h2>Heading 1</h2>`
			`<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`<<<<<<< HEAD`
extended page 2025-03-08 21:14:44 +00:00			`<p><a class="btn btn-success" href="#" role="button">View details »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`=======`
Update index.html Changed button text from "View details" to "More". 2025-03-08 21:21:56 +00:00			`<p><a class="btn btn-primary" href="#" role="button">More »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75`
prvy commit 2023-02-20 09:39:00 +00:00			`</div>`
			`<div class="col-md-4">`
			`<h2>Heading 2</h2>`
			`<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`<<<<<<< HEAD`
extended page 2025-03-08 21:14:44 +00:00			`<p><a class="btn btn-success" href="#" role="button">View details »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`=======`
Update index.html Changed button text from "View details" to "More". 2025-03-08 21:21:56 +00:00			`<p><a class="btn btn-primary" href="#" role="button">More »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75`
prvy commit 2023-02-20 09:39:00 +00:00			`</div>`
			`<div class="col-md-4">`
			`<h2>Heading 3</h2>`
			`<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`<<<<<<< HEAD`
extended page 2025-03-08 21:14:44 +00:00			`<p><a class="btn btn-success" href="#" role="button">View details »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`=======`
Update index.html Changed button text from "View details" to "More". 2025-03-08 21:21:56 +00:00			`<p><a class="btn btn-primary" href="#" role="button">More »</a></p>`
Resolved merge conflicts 2025-03-08 21:23:28 +00:00			`>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75`
prvy commit 2023-02-20 09:39:00 +00:00			`</div>`
			`</div>`
			`</div>`

			`</body>`
added footer 2025-03-08 21:07:56 +00:00			`<footer>`
			`<div class="container">`
			`<hr />`
			`KPI TUKE`
			`</div>`
			`</footer>`

prvy commit 2023-02-20 09:39:00 +00:00			`</html>`