valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-07 02:15:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved git conflict

Browse Source
This commit is contained in:
Jesús Ángel González Novez 2017-11-09 16:58:54 +01:00
parent 5640fd92b5
commit d454a4854d
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/less/common.less
View File

@ -1,19 +1,10 @@
.headBar {
<<<<<<< HEAD
background-color: #f7f7f7;
min-width: 463px;
}
.horizontalTabsBar {
background-color: #f7f7f7
=======
background-color: #f7f7f7;
min-width: 463px;
}
.horizontalTabsBar {
background-color: #f7f7f7
>>>>>>> 91614ec9b34077cf4c6953997321839364467db4
}
.tabView md-nav-bar md-nav-ink-bar {