fixed conflicts

near · Nov 16, 2023 · 09e2c12 · 09e2c12
2 parents f390817 + ae42bc6
commit 09e2c12
Show file tree

Hide file tree

Showing 3 changed files with 10,984 additions and 0 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -26,6 +26,10 @@ import * as show from './messages';
       contract,
       frontend,
       tests,
+<<<<<<< HEAD
+=======
+      projectName,
+>>>>>>> master
       templatesDir: path.resolve(__dirname, '../templates'),
       projectPath,
     });