Skip to content
Snippets Groups Projects
Commit 36b7039b authored by mm82beje's avatar mm82beje
Browse files

Merge branch 'main' into 'feature' 

# Conflicts:
#   README.md
parents 8f9b3c4c b6cf97d2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
README.md
+ 2
− 1
View file @ 36b7039b
......@@ -6,4 +6,5 @@ it can do:
- b
- c
- d
- now also including e
\ No newline at end of file
- now also including e
- hello it's esther!
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment