From 78846f70d15bf47d85dca375b32267b4d757d958 Mon Sep 17 00:00:00 2001
From: Chris Dias <cdias@microsoft.com>
Date: Thu, 12 Jan 2023 16:29:30 -0800
Subject: [PATCH] conflict

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index 00f5e7c..cf535e4 100644
--- a/app.js
+++ b/app.js
@@ -8,7 +8,7 @@ var hbs = require('hbs');
 var session = require('express-session');
 
 var index = require('./routes/index');
-
+// conflict
 var app = express();
 
 // view engine setup