fix merge conflicts

2018-08-09 15:58:02 -07:00 · 2018-08-09 15:58:02 -07:00 · 650d30c4bc
commit 650d30c4bc
parent b89bef6e89 4ee497a83f
9 changed files with 737 additions and 380 deletions
--- a/app/templates/fileIcon/fileIcon.css
+++ b/app/templates/fileIcon/fileIcon.css
@ -26,4 +26,5 @@
  font-size: 7px;
  font-weight: 600;
  text-transform: uppercase;
+  user-select: none;
 }