Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@fakela
fakela committed Jan 22, 2019
1 parent 3b504bd commit ba4e8b8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions css/bootstrap.min.css
View file

Large diffs are not rendered by default.

0 comments on commit ba4e8b8

Please sign in to comment.