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/sass/utils/_module.scss | |
| parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
| parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
| download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip | |
Fixing merge
Diffstat (limited to 'webapp/sass/utils/_module.scss')
| -rw-r--r-- | webapp/sass/utils/_module.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/sass/utils/_module.scss b/webapp/sass/utils/_module.scss index e7f0c0c46..5dddcaef7 100644 --- a/webapp/sass/utils/_module.scss +++ b/webapp/sass/utils/_module.scss @@ -1,5 +1,5 @@ // Only for combining all the files in this folder @import 'variables'; -@import 'animations'; @import 'functions'; @import 'mixins'; +@import 'animations'; |