Skip to content
Snippets Groups Projects
Commit f85b58ca authored by YongJae's avatar YongJae
Browse files

Merge conflict 해결

parents d7fa9b24 b835e437
No related branches found
No related tags found
1 merge request!9MongoDB Atlas 적용 및 불필요한 파일 삭제와 port3000 연결문제 수정
Expand all Show whitespace changes
Inline Side-by-side
frontend/index.html
+ 1
− 1
View file @ f85b58ca
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>majorbook</title> <title>frontend</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
frontend/package-lock.json
+ 665
− 30
View file @ f85b58ca
This diff is collapsed.
frontend/package.json
+ 5
− 1
View file @ f85b58ca
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "frontend", "name": "frontend",
"version": "1.0.0", "version": "1.0.0",
"description": "A Vue.js project", "description": "A Vue.js project",
"author": "YongJae <sdc689@gmail.com>", "author": "HyeonJu <hj950000@ajou.ac.kr>",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
"dependencies": { "dependencies": {
"axios": "^0.19.0", "axios": "^0.19.0",
"node-sass": "^4.13.0", "node-sass": "^4.13.0",
<<<<<<< HEAD
=======
"eslint": "^6.7.0",
>>>>>>> master
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-material": "^1.0.0-beta-11", "vue-material": "^1.0.0-beta-11",
"vue-multiselect": "^2.1.6", "vue-multiselect": "^2.1.6",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr