From 43c314a5acf7ae29861808dbaeca9f2acdb11974 Mon Sep 17 00:00:00 2001 From: zkpunc Date: Fri, 16 Dec 2022 13:08:33 +0800 Subject: [PATCH 1/2] updated response object --- node/routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/routes/index.js b/node/routes/index.js index ecca96a..2fb7cea 100644 --- a/node/routes/index.js +++ b/node/routes/index.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('index', { title: 'Express' }); + res.render('index', { title: 'Hello git' }); }); module.exports = router; From 042ac1bbc0612234a88f9373adeccf9297e2d309 Mon Sep 17 00:00:00 2001 From: zkpunc Date: Fri, 16 Dec 2022 18:07:23 +0800 Subject: [PATCH 2/2] mergetest --- node/routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/routes/index.js b/node/routes/index.js index 2fb7cea..4a14c20 100644 --- a/node/routes/index.js +++ b/node/routes/index.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('index', { title: 'Hello git' }); + res.render('index', { title: 'Hello git merge test' }); }); module.exports = router;