diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-17 11:59:44 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-17 11:59:44 -0400 |
commit | 1fe2f7301a03f1051245fc38492c2ad4f5357de3 (patch) | |
tree | cd43f9358beadc4ad943e61c45cf7aefed615c6f | |
parent | 18fa0596abb5ea23208deeabcd1e9d0af493b1b4 (diff) | |
parent | b874934acb4258ebfc6ab9601dd742bd2ba87155 (diff) | |
download | chat-1fe2f7301a03f1051245fc38492c2ad4f5357de3.tar.gz chat-1fe2f7301a03f1051245fc38492c2ad4f5357de3.tar.bz2 chat-1fe2f7301a03f1051245fc38492c2ad4f5357de3.zip |
Merge pull request #2463 from mattermost/fix-merge
Fix bad scss merge
-rw-r--r-- | web/sass-files/sass/routes/_print.scss | bin | 4314 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/web/sass-files/sass/routes/_print.scss b/web/sass-files/sass/routes/_print.scss Binary files differdeleted file mode 100644 index b03a549fb..000000000 --- a/web/sass-files/sass/routes/_print.scss +++ /dev/null |