From e0fa3b1645b8ba9328f33a4f4c7efbe20e28ca1b Mon Sep 17 00:00:00 2001
From: Kwangbin Hyun <bio8641@naver.com>
Date: Tue, 5 Dec 2023 12:55:25 +0900
Subject: [PATCH] Fix: merge confilct
---
frontend/src/pages/Main.js | 4 ----
frontend/src/pages/PostRead.js | 10 ----------
2 files changed, 14 deletions(-)
diff --git a/frontend/src/pages/Main.js b/frontend/src/pages/Main.js
index 559790b6..6f29dc04 100644
--- a/frontend/src/pages/Main.js
+++ b/frontend/src/pages/Main.js
@@ -52,11 +52,7 @@ function Main() {
async function requestLoadArticle() {
const response = await axios({
-<<<<<<< HEAD
url: 'http://localhost:8080/article', // 통신할 웹문서
-=======
- url: 'http://localhost:8080/post/article', // 통신할 웹문서
->>>>>>> 2892e0e9c9dd1752080a370ba274deeca6254246
method: 'get', // 통신할 방식
});
return response;
diff --git a/frontend/src/pages/PostRead.js b/frontend/src/pages/PostRead.js
index 1aae62a8..54dab046 100644
--- a/frontend/src/pages/PostRead.js
+++ b/frontend/src/pages/PostRead.js
@@ -57,20 +57,10 @@ function PostRead() {
});
}
-<<<<<<< HEAD
- async function requestLoadArticleById(id) {
- const response = await axios({
- url: `http://localhost:8080/article/${id}`, // 통신할 웹문서
- method: 'get', // 통신할 방식
- });
- return response;
- }
-=======
const onTextChange = (e) => {
const {value} = e.target;
setInputComment(value);
}
->>>>>>> 2892e0e9c9dd1752080a370ba274deeca6254246
const onSubmit = e => {
e.preventDefault();
--
GitLab