Skip to content

Feauture xyz #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
ryanruzani wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feauture xyz #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f61dfa
added another p tag
ryanruzani Mar 25, 2023
e697276
Update index.html
ryanruzani Mar 25, 2023
b29d231
resolved conflict
ryanruzani Mar 25, 2023
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
31 changes: 20 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
$ cat index.html
<!DOCTYPE html>
<html>
<head>
<title>Page Title</title>
</head>
</body>
<p>first paragraph.</p>
</body>
</html>

<!DOCTYPE html>
<html>
<head>
<title>Page Title</title>
</head>
</body>
<<<<<<< HEAD
<p>This is a Heading</p>
<p>first paragraph.</p>
<h1>This is a another paragraph</h1>
<p>This is a paragraph.</p>
<body>
=======
<h1>This is a Heading</h1>
<p>This is a paragraph.</p>
<p>This is a another paragraph.</p>
</body>
>>>>>>> 6ba97e9 (resolved conflict)
</html>