Skip to content

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

correction erreur merge

parent 39414995
Pipeline #651 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      LICENCE
      View file @ 483e1442
      <<<<<<< HEAD
      Licence APACHE
      Licence MIT
      >>>>>>> licence
      \ No newline at end of file
      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