Skip to content
Snippets Groups Projects
Commit 95e62b72 authored by Simon Bliudze's avatar Simon Bliudze
Browse files

Trying to creat a conflict

parent 404dbb08
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
conflict
+ 1
− 1
View file @ 95e62b72
to create
a
conflict
\ No newline at end of file
conflictSimon
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment