Commit 6677bbc0 authored by Lila NCIKLER's avatar Lila NCIKLER

Commit Licence fix conflicts

parents 65d7340d 4d5b6e09
Pipeline #761 failed with stages
<<<<<<< HEAD
Licence APACHE Licence APACHE
=======
Licence MIT
>>>>>>> licence
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