Giter VIP home page Giter VIP logo

Comments (2)

livlikwav avatar livlikwav commented on August 27, 2024

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

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

다음할일은 무엇일까?

from uos_yomo.

livlikwav avatar livlikwav commented on August 27, 2024

$ git pull
CONFLICT (modify/delete): views/index.ejs deleted in f483f10 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.

from uos_yomo.

Related Issues (14)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.