Fix: merge confilct

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;

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();