mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-05-28 19:41:33 +02:00
Fix forgotten conflict.
This commit is contained in:
@@ -201,10 +201,7 @@
|
||||
@toolbar-icon-btn-hover-shadow : none;
|
||||
@toolbar-border-bottom : 1px solid @toolbar-border-color;
|
||||
@toolbar-icon-btn-hover-boxshadow : none;
|
||||
<<<<<<< HEAD
|
||||
@toolbar-font-size : 13px;
|
||||
=======
|
||||
>>>>>>> master
|
||||
|
||||
// Editor file-tree
|
||||
@file-tree-bg : @ol-blue-gray-4;
|
||||
|
||||
Reference in New Issue
Block a user