diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
| commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
| tree | f152b638101b224ffc59ed000e384b651915266a /webapp/root.jsx | |
| parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
| parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
| download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip | |
Fixing merge
Diffstat (limited to 'webapp/root.jsx')
| -rw-r--r-- | webapp/root.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index 8ebe51bd2..2ce220f1d 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -3,11 +3,11 @@ import $ from 'jquery'; -import 'sass/styles.scss'; import 'bootstrap/dist/css/bootstrap.css'; import 'jasny-bootstrap/dist/css/jasny-bootstrap.css'; import 'bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css'; import 'google-fonts/google-fonts.css'; +import 'sass/styles.scss'; import React from 'react'; import ReactDOM from 'react-dom'; |