merge conflict resolve

master
Devin Ivy 2021-04-11 23:24:33 -04:00 committed by cemal
parent 0b129a2c5f
commit d9918dc27a
1 changed files with 1 additions and 1 deletions

View File

@ -1,5 +1,5 @@
{ {
"name": "iut-project", "name": "iut-project-cemal",
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "",
"author": "", "author": "",