백승욱 / movie-reco-chatbot

Go to a project
Toggle navigation Toggle navigation pinning
백승욱
ce9f557f 1 parent bd6b6af3

Modify main.js

Inline Side-by-side
Showing 1 changed file with 0 additions and 8 deletions
...@@ -28,11 +28,7 @@ const user_id = config.USER_ID; ...@@ -28,11 +28,7 @@ const user_id = config.USER_ID;
28 28
29 29
30 // SHOW MENU 30 // SHOW MENU
31 -<<<<<<< HEAD
32 function ShowMenu(replyToken) { 31 function ShowMenu(replyToken) {
33 -=======
34 -function ShowMenu(replyeToken) {
35 ->>>>>>> 540e801ecd8d88e2733b5a89c69473c69ed530f3
36 request.post({ 32 request.post({
37 url: LINE_URL + '/reply', 33 url: LINE_URL + '/reply',
38 headers: { 34 headers: {
...@@ -73,11 +69,7 @@ function Response(replyToken, message) { ...@@ -73,11 +69,7 @@ function Response(replyToken, message) {
73 MovieInfo.MovieInfo(replyToken, message); 69 MovieInfo.MovieInfo(replyToken, message);
74 } 70 }
75 else if (message == '0' || message == '0번') { 71 else if (message == '0' || message == '0번') {
76 -<<<<<<< HEAD
77 ShowMenu(replyToken); 72 ShowMenu(replyToken);
78 -=======
79 - ShowMenu(replyeToken);
80 ->>>>>>> 540e801ecd8d88e2733b5a89c69473c69ed530f3
81 } 73 }
82 else if (message == '1' || message == '1번') { 74 else if (message == '1' || message == '1번') {
83 BoxOffice.ShowYesterdayRank(replyToken); 75 BoxOffice.ShowYesterdayRank(replyToken);
......