Skip to content
Snippets Groups Projects
Commit cbf23ade authored by Guille Polito's avatar Guille Polito
Browse files

forcing the conflict

parent 1ffe22aa
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
conflict
+ 3
− 3
View file @ cbf23ade
to create
a
conflict
\ No newline at end of file
yes
this
will force it
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment