-
Notifications
You must be signed in to change notification settings - Fork 0
/
details.html
executable file
·85 lines (83 loc) · 4.17 KB
/
details.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Major Guidance Solutions is a training and web-consulting company. We build websites, custom solutions, and training courses" />
<title>Major Guidance Solutions - Sample Website for Training Courses</title>
<!--<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />-->
<link href="css/bootstrap.min.css" rel="stylesheet"/>
<!--<link href="css/bootstrap-theme.min.css" rel="stylesheet"/>-->
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/yeti/bootstrap.min.css" rel="stylesheet" />
<link href="css/site.css" rel="stylesheet"/>
</head>
<body>
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="http://www.majorguidancesolutions.com" class="navbar-brand">
<img src="http://lorempixel.com/150/30/" title="Your company Logo" alt="A company Logo" height="30px"/>
</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="menu-item dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Our Services</a>
<ul class="dropdown-menu">
<li class="menu-item"><a href="index.html">Home</a></li>
<li class="menu-item"><a href="details.html">Another Page</a></li>
</ul>
</li>
<li><a href="Portfolio.html">Portfolio</a></li>
<li><a href="About.html">About</a></li>
<li><a href="ContactUs.html">Contact Us</a></li>
</ul>
</div>
</div>
</div>
<div class="container body-content">
<h1> Details Page with more content... </h1>
<h2> Git Is Awesome and I'm learning so much cool stuff! </h2>
<h3> Multiple changes are coming </h3>
<h4> Yet another change </h4>
<ol>
<li>Setup to use diff.tool - default difftool = code!</li>
<li>This was made in Feature branch 01!</li>
<li>This change was made locally and pushed to GitHub at the branch level</li>
</ol>
<ol>
<li>Team flow started!</li>
<li>Added yet another feature from dev 1 workflow</li>
<li>I think is better!</li>
<li>We have a mergetool!!!</li>
</ol>
<ol>
<li>This is the git ammend demo!</li>
</ol>
<h1>This is my change! I think we need this</h1>
<h2> Creating and solving a conflict at GitHub</h2>
<ol>
<li>A simple change made at GitHub!</li>
<li>.....</li>
</ol>
<ol>
<li>Starting the rebase developer 1</li>
<li>Commit 2 of the rebase for dev 1</li>
</ol>
<hr />
<footer>
<p>© 2017 - <a href="http://www.majorguidancesolutions.com">Major Guidance Solutions</a></p>
</footer>
</div>
<!-- Scripts -->
<script src="js/lib/jquery-3.2.1.min.js" type="text/javascript"></script>
<!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>-->
<script src="js/lib/bootstrap.min.js" type="text/javascript"></script>
<!--<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>-->
</body>
</html>