search

livlikwav / UOS_YOMO

calender website for UOS students to find out events
0 stars 0 forks source link

하경민 일거리 #12

Open livlikwav opened 5 years ago

livlikwav commented 5 years ago

191104 일단 부트스트랩 다운받고 적용했는데, 1) navbar 튜토리얼 따라 친게 작동을 안한다 다른거 소스 따와서 적용하기 2) 커밋하기

livlikwav commented 4 years ago

191111 bootstrap popper.js bootstrap-loader 다 npm uninstall 후 css, js 직접 public/stylesheets에 추가해서 적용함

navbar. ejs와 footer.ejs 만들어서 index.ejs에 적용함 일단

다음할일은 무엇일까?

livlikwav commented 4 years ago

$ git pull CONFLICT (modify/delete): views/index.ejs deleted in f483f103641061d1f66a6a62497cfc3d1410031d and modified in HEAD. Version HEAD of views/index.ejs left in tree. Auto-merging routes/calendar.js CONFLICT (content): Merge conflict in routes/calendar.js Auto-merging public/stylesheets/style.css Automatic merge failed; fix conflicts and then commit the result.