From d9918dc27a113d99f70e35e4fc4b5fef749a70db Mon Sep 17 00:00:00 2001
From: Devin Ivy <devin@bigroomstudios.com>
Date: Sun, 11 Apr 2021 23:24:33 -0400
Subject: [PATCH] merge conflict resolve

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f427a67..32328a5 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "iut-project",
+  "name": "iut-project-cemal",
   "version": "1.0.0",
   "description": "",
   "author": "",