Skip to content

create conflict 2.0 #7

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
quanBong wants to merge 2 commits into
base: main
Choose a base branch
from
Open

create conflict 2.0 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd6076
create conflict 2.0
quanBong Jul 18, 2024
bba3f85
update the readme file
quanBong Jul 22, 2024
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
2 changes: 2 additions & 0 deletions HomePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
<head><head></head></head>
<body>
<h1>This is P5</h1>
<h1>I dont know how to do this</h1>
<h1>and i hope this can make the conflict</h1>
</body>
</html>
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# group5
# group5

# here again the hello world