merge conflict resolve

2021-04-11 23:24:33 -04:00 · 2021-04-11 23:24:33 -04:00 · d9918dc27a
parent 0b129a2c5f
commit d9918dc27a
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
-  "name": "iut-project",
+  "name": "iut-project-cemal",
  "version": "1.0.0",
  "description": "",
  "author": "",