Commit bd9a525e authored by Yoon, Daeki's avatar Yoon, Daeki 😅
Browse files

Merge branch 'master' into master-up

parents 72a72d9e af968df4
...@@ -2,7 +2,7 @@ import React from 'react'; ...@@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import './scss/custom.scss'; import './scss/custom.scss';
import 'bootstrap'; import 'bootstrap';
import 'bootstrap/dist/js/popper.min.js'; import 'bootstrap/dist/css/bootstrap.css';
import App from './App'; import App from './App';
import reportWebVitals from './reportWebVitals'; import reportWebVitals from './reportWebVitals';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment