Resolved git conflict

This commit is contained in:
Jesús Ángel González Novez 2017-11-09 16:58:54 +01:00
parent 5640fd92b5
commit d454a4854d

View File

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