1124 mergeconflict 수정 완료

backend/app.js

backend/public/index.html

...ublic/static/css/app.ec2d265986b1f9dcd1cffe8ec691bc1f.css

...c/static/css/app.ec2d265986b1f9dcd1cffe8ec691bc1f.css.map

backend/public/static/img/img1.e3d64af.jpg

backend/public/static/img/img1.jpg

backend/public/static/js/app.d7bc7e91d6675626d211.js

backend/public/static/js/app.d7bc7e91d6675626d211.js.map

...end/public/static/js/manifest.2ae2e69a05c33dfc65f8.js.map

frontend/package-lock.json

frontend/package.json

frontend/src/App.vue

frontend/src/components/BookIndexPage.vue

frontend/src/components/BookSearchPage.vue

frontend/src/components/BookShowPage.vue

frontend/src/components/buy.vue

frontend/src/components/home.vue

frontend/src/components/myPage.vue

frontend/src/components/sell.vue

frontend/src/components/signup.vue