Skip to content

Commit

Permalink
Fixed merge error.
Browse files Browse the repository at this point in the history
  • Loading branch information
glughi committed Sep 26, 2019
1 parent 999e0c4 commit a1c8b15
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions lib/Views/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ body {

// Import any custom fonts here
//@import url(https://fonts.googleapis.com/css?family=Josefin+Sans:300,400,700);
@import url(
https://fonts.googleapis.com/css?family=Titillium+Web:300,
400,
700
);
@import url(https://fonts.googleapis.com/css?family=Titillium+Web:300,400,700);

html {
font-family: $font-base;
Expand Down

0 comments on commit a1c8b15

Please sign in to comment.