Skip to content

Style #1

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
WinGood wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Style #1

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8667f3e
Added css stylesheet
WinGood Apr 11, 2015
f35aa33
Hello uses style.css
WinGood Apr 11, 2015
ec24473
Updated index.html
WinGood Apr 11, 2015
edd0063
Merge branch 'master' into style
WinGood Apr 11, 2015
d36d97e
Merged master fixed conflict
WinGood Apr 11, 2015
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
Prev Previous commit
Merged master fixed conflict
  • Loading branch information
@WinGood
WinGood committed Apr 11, 2015
commit d36d97e6c61c5a2f118a70e7f2af575ef0c2cc51
4 changes: 2 additions & 2 deletions lib/hello.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<link type="text/css" rel="stylesheet" media="all" href="style.css" />
</head>
<body>
<h1>Hello, World!</h1>
</body>
<h1>Hello, World! Life is great!</h1>
</head>
</html>
You are viewing a condensed version of this merge commit. You can view the full changes here.