Skip to content

Shot #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MinorityProgrammers wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Shot #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09c0813
after trying git add
Feb 5, 2020
3738197
After pull conflict
Feb 5, 2020
fcf4640
added comment to shot branch to see about conflicts
shotty2botty Feb 5, 2020
d7e95b5
bathoom phone edit
Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions about-us.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i"
rel="stylesheet"
/>

<!-- Trying to just see how comments are -->
<!-- Custom styles for this template -->
<link href="css/one-page-wonder.css" rel="stylesheet" />
</head>
Expand Down Expand Up @@ -80,7 +80,7 @@ <h2 class="masthead-subheading mb-0">Code, Culture, Community.</h2>
<a href="#" class="btn btn-primary btn-xl rounded-pill mt-5"
>Learn More</a
>
</div>
putting comments im phome in batjrpom </div>
</div>
<div class="bg-circle-1 bg-circle"></div>
<div class="bg-circle-2 bg-circle"></div>
Expand Down Expand Up @@ -139,10 +139,20 @@ <h4>Lorem ipsum dolor sit.</h4>
<div class="col-sm-3">
<img
style="overflow:hidden;"
<<<<<<< HEAD
<<<<<<< HEAD
class="portrait-circle img-fluid"
src=""
=======
class="rounded-circle img-fluid"
src="https://previews.123rf.com/images/kritchanut/kritchanut1406/kritchanut140600093/29213195-male-silhouette-avatar-profile-picture.jpg"
>>>>>>> master
=======
class="portrait-circle img-fluid"
src=""
class="rounded-circle img-fluid"
src="https://previews.123rf.com/images/kritchanut/kritchanut1406/kritchanut140600093/29213195-male-silhouette-avatar-profile-picture.jpg"
>>>>>>> 1f85b73a41933e6562cb99f35e200607dedd235b
alt=""
/>
</div>
Expand Down