Skip to content

Change #3

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

Change #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dffa86
Adding contribution1.txt
rimonsh Mar 10, 2023
5756974
Adding contribution2.txt
rimonsh Mar 10, 2023
11cb9f6
changing file
rimonsh Mar 10, 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
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions contribution1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Mauris tortor ligula, vestibulum eget metus eget,
vulputate rutrum lectus. Suspendisse ac hendrerit
nunc. Nulla varius lectus vitae massa auctor feugiat.
Nulla mattis lacus leo, in egestas ex eleifend vitae.
Praesent ullamcorper eros a mauris lacinia, eu
ullamcorper tortor dapibus. Sed eget vehicula felis.
Donec vitae ipsum id risus condimentum consequat in a
mi. Integer sollicitudin sit amet nunc vitae
sollicitudin. Duis tincidunt sapien id ultrices
7 changes: 7 additions & 0 deletions contribution2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Nam suscipit ante nec eros consectetur pretium. Etiam
lacinia blandit molestie. Nam pulvinar nibh elit, vel
condimentum ante accumsan a. Vivamus tellus lectus,
pretium nec erat id, porttitor consequat sapien.
Pellentesque porttitor tincidunt metus. Donec vitae
fringilla nulla. Praesent pretium mollis erat, et
vestibulum nisi tempus a.
4 changes: 4 additions & 0 deletions file2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ sollicitudin nunc, sit amet sodales leo sapien et sem.
Maecenas mauris eros, sollicitudin at elit in,
pellentesque
mattis orci. Aliquam elementum finibus dictum.
<<<<<<< HEAD

CHANGED BY MAINTAINER

=======
CHANGED BY CONTRIBUTOR
>>>>>>> ccbd94b (changing files)
Integer ac nibh nec est porttitor semper ultrices eu
ligula. Etiam sodales porttitor venenatis.
9 changes: 8 additions & 1 deletion file3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
Quisque nec lectus viverra, tempus mi molestie, posuere
mauris. Nam iaculis ac eros eget bibendum. Phasellus
egestas fringilla libero sed viverra.
<<<<<<< HEAD

CHANGED BY MAINTAINER
CHANGED BY MAINTAINER
=======
Proin hendrerit convallis nibh ac gravida. Integer
placerat
accumsan nibh, vitae bibendum urna ullamcorper in.
ADDED BY CONTRIBUTOR
>>>>>>> ccbd94b (changing files)