Resolve conflicts

This commit is contained in:
perryharlock
2013-11-11 15:05:43 +00:00
11 changed files with 63 additions and 13 deletions

File diff suppressed because one or more lines are too long

View File

@@ -2,8 +2,6 @@
// Bootswatch
// -----------------------------------------------------
@import url("//fonts.googleapis.com/css?family=Lato:400,700,900,400italic");
// Navbar =====================================================================
// Buttons ====================================================================