Commit 0e8e96f67e38553f1c299b8ae532e4c871eeb8ea
Fix conflict characters in main.css
| | | | | 73 | margin-top: 5%; | 73 | margin-top: 5%; |
|---|
| 74 | } | 74 | } |
|---|
| 75 | | 75 | |
|---|
| 76 | <<<<<<< HEAD | | <<<<<<< HEAD |
|---|
| 77 | a, a:hover, a:active { | | a, a:hover, a:active { |
|---|
| 78 | ======= | | ======= |
|---|
| 79 | #main-icons { | 76 | #main-icons { |
|---|
| 80 | margin-top: 30px; | 77 | margin-top: 30px; |
|---|
| 81 | } | 78 | } |
|---|
| 82 | | 79 | |
|---|
| 83 | a, a:hover, a:active{ | 80 | a, a:hover, a:active{ |
|---|
| 84 | >>>>>>> 5c07767178533711f1d76ca6b19129a8da67fb9f | | >>>>>>> 5c07767178533711f1d76ca6b19129a8da67fb9f |
|---|
| 85 | color:#262525; | 81 | color:#262525; |
|---|
| 86 | } | 82 | } |
|---|
| 87 | /*.navbar-default { | 83 | /*.navbar-default { |
|---|
