Skip to content

T
TP Git
Commit 39414995 authored by Yoann Bordin's avatar Yoann Bordin
Browse files
Options

réglage conflit licence

parents b4d832f3 3f63f942
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
LICENCE
View file @ 39414995
<<<<<<< HEAD
Licence APACHE Licence APACHE
Markdown is supported
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