@import 'bootplus/bootplus';
@import 'bootplus/responsive';
@import 'font-awesome/font-awesome';

// Set the correct sprite paths
@iconSpritePath: "glyphicons-halflings.png";
@iconWhiteSpritePath: "glyphicons-halflings-white.png";

body { margin-top: 60px; }
@import 'bootplus/bootplus';
@import 'bootplus/responsive';
//@import 'font-awesome/font-awesome';

// Set the correct sprite paths
@iconSpritePath: "glyphicons-halflings.png";
@iconWhiteSpritePath: "glyphicons-halflings-white.png";

body { margin-top: 60px; }
Clean up after the merge conflict
Clean up after the merge conflict
