2020-1-capstone-design1 / Triz_Project1

Go to a project
Toggle navigation Toggle navigation pinning
MinsoftK
517ecc63 2 parents a1bcc167 b2b41f3f

Merge branch 'master' of https://bitbucket.org/vel1024/capstone 

# Conflicts:
#	front/web/ex/test
#	front/web/test.md
Inline Side-by-side
Showing 3 changed files with 17 additions and 0 deletions
<!DOCTYPE html>
<html>
<body>
<input type="button" value="fetch" onclick="
fetch('css').then(function(response){
response.text().then(function(text){
alert(text);
})
})
">
</body>
</html>
......@@ -3,7 +3,10 @@
# function을 만들어서 html 페이지 입력 받아오기
#html 이름을 수정할때마다 메인페이지의 모든 이름을 수정해야해서 까다롭다
<<<<<<< HEAD
test
test
=======
>>>>>>> b2b41f3f62c815cfb25461fd8e958477ff581840
test
......