Commit 8ad0df123cb3fe148930ef2f083302ac4acfa333

Authored by Leandro Santos
1 parent fc892923

fix conflit

sass/proposal_detail/_proposal-detail-base.scss
1 1 @each $category, $color in $categories {
2   -<<<<<<< HEAD
3   - .#{$category} {
4   -=======
5 2 .#{$category} .proposal-detail-base {
6   ->>>>>>> c9ef3706dcfc94f2fb21b61a8636092fdf00ed03
7 3 font-family: 'Open Sans', sans-serif;
8 4 font-size: 16px;
9 5 font-weight: 300;
... ...