오지민 / HomePurchaseAgePrediction

Go to a project
Toggle navigation Toggle navigation pinning
서연진
1d767be6 2 parents 38de1c33 ee1fa799

Fix conflict

Inline Side-by-side
Showing 1 changed file with 1 additions and 0 deletions
...@@ -49,6 +49,7 @@ app.get("/geolocation", function (req, res) { ...@@ -49,6 +49,7 @@ app.get("/geolocation", function (req, res) {
49 // res.sendFile(path.join(__dirname + "/kakao/kakaomap.html"), { json_data: json_data }); 49 // res.sendFile(path.join(__dirname + "/kakao/kakaomap.html"), { json_data: json_data });
50 }); 50 });
51 51
52 +
52 try { 53 try {
53 const option = { 54 const option = {
54 ca: fs.readFileSync("/etc/letsencrypt/live/" + domain + "/fullchain.pem"), 55 ca: fs.readFileSync("/etc/letsencrypt/live/" + domain + "/fullchain.pem"),
......