Skip to content
Snippets Groups Projects
Commit 3a165d58 authored by Krzysztof Konarski's avatar Krzysztof Konarski
Browse files

Merge branch 'main' into '3' 

# Conflicts:
#   README.md
parents c14b9d12 c217c478
No related branches found
No related tags found
1 merge request!3Changed line 1 from branch 3
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
README.md
+ 4
− 0
View file @ 3a165d58
This line was changed by branch 3
This line was changed by branch 2.
Branch 1 changed this line!
# lab01
## test
## I don't like conflicts and I don't like to solve them
## this line will cause conflicts trust me
## why conflict appeared
## Getting started
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment