summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-03-17 11:59:44 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-03-17 11:59:44 -0400
commit1fe2f7301a03f1051245fc38492c2ad4f5357de3 (patch)
treecd43f9358beadc4ad943e61c45cf7aefed615c6f
parent18fa0596abb5ea23208deeabcd1e9d0af493b1b4 (diff)
parentb874934acb4258ebfc6ab9601dd742bd2ba87155 (diff)
downloadchat-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.scssbin4314 -> 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
deleted file mode 100644
index b03a549fb..000000000
--- a/web/sass-files/sass/routes/_print.scss
+++ /dev/null
Binary files differ