conflict fixed

@@ -12,9 +12,11 @@ const axios = require('axios')
 const cheerio = require('cheerio')
 var app = express();
 var cron = require('node-cron');
-app.use(bodyParser.json());
-
 
+const fs = require('fs');
+var app = express();
+var stock_code = "005930"
+app.use(bodyParser.json());
 
 app.post('/hook', function (req, res) {
 
@@ -22,12 +24,31 @@ app.post('/hook', function (req, res) {
     var source = eventObj.source;
     var message = eventObj.message; 
 
+
+    let stockList = [];
+    import './stock_names.txt';
+
+    fs.readFile('./stock_names.txt', 'utf8', (err,data) => { // 파일 import하고 stockList로 저장
+        if (err){
+            console.error(err)
+            return
+        }
+        var tempstockList = data.toString().split("\n"); // ex) stockList = [[012312 ~~],[123012 ~~],[192312 ~~],[192310 ~~],[...]]
+        for (x in tempstockList){
+            var stockList = tempstockList[i].toString().split(" "); // ex) stockList = [[012312,~~],[1230012,~~],[1923,~~],[192310,~~],[...]]
+        }
+        // for (i in stockList) {
+        //     console.log(stockList[i]);
+        // }
+    })
+
     // request log
     console.log('======================', new Date() ,'======================');
     console.log('[request]', req.body);
     console.log('[request source] ', eventObj.source);
     console.log('[request message]', eventObj.message);
 
+<<<<<<< HEAD
 
     cron.schedule('*/5 * * * *', () => {
         const temp = axios.get(`https://finance.naver.com/item/main.nhn?code=${stock_code}%22`).then(
@@ -42,6 +63,30 @@ app.post('/hook', function (req, res) {
     });
 
 
+=======
+    for (let i = 0; i<stockList.length; i++) {
+        if (eventObj.message.text == stockList[i][1]){  // 입력한거 나오면 코드로 바꿔줌
+            stock_code = stockList[i][0]
+        }
+        else{
+            console.log('Not in list');
+        }
+
+    }
+
+    // if (eventObj.message.text == "영어"){
+    //     lan = "en"
+    // }
+    // else if (eventObj.message.text == "일본어"){
+    //     lan = "ja"
+    // }
+    // else if (eventObj.message.text == "프랑스어"){
+    //     lan = "fr"
+    // }
+    // else{
+    //     trans(eventObj.replyToken, eventObj.message.text);
+    // }    
+>>>>>>> stock_list
     request.post(
         {
             url: TARGET_URL,