diff options
| author | LUXEY Adrien <adrien.luxey@inria.fr> | 2020-10-13 13:00:39 +0200 |
|---|---|---|
| committer | LUXEY Adrien <adrien.luxey@inria.fr> | 2020-10-13 13:00:39 +0200 |
| commit | b623edf7520174219db33f2f045fbe6ed7558aa0 (patch) | |
| tree | 6f8c341e95a8d4071302fc9ab46ea7b9c4d14ada /LICENSE | |
| parent | a2ec1011bd728b4560ccc6ade93ac04836259028 (diff) | |
| parent | 5e9b6111ee012d3f659cda71afceffbd5142c4c2 (diff) | |
| download | design-b623edf7520174219db33f2f045fbe6ed7558aa0.tar.gz design-b623edf7520174219db33f2f045fbe6ed7558aa0.zip | |
merged conflict
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions