merge conflict resolve
parent
0b129a2c5f
commit
d9918dc27a
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "iut-project",
|
"name": "iut-project-cemal",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
|
|
Loading…
Reference in New Issue