github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix forgotten conflict.

Browse source
This commit is contained in:
Paulo Reis 2017-12-20 09:51:32 +00:00
parent 0a0c6c6c0c
commit 8d1736af59
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/web/public/stylesheets/core/ol-variables.less
View file

@ -201,10 +201,7 @@
@toolbar-icon-btn-hover-shadow : none; @toolbar-icon-btn-hover-shadow : none;
@toolbar-border-bottom : 1px solid @toolbar-border-color; @toolbar-border-bottom : 1px solid @toolbar-border-color;
@toolbar-icon-btn-hover-boxshadow : none; @toolbar-icon-btn-hover-boxshadow : none;
<<<<<<< HEAD
@toolbar-font-size : 13px; @toolbar-font-size : 13px;
=======
>>>>>>> master
// Editor file-tree // Editor file-tree
@file-tree-bg : @ol-blue-gray-4; @file-tree-bg : @ol-blue-gray-4;