1
0
mirror of https://github.com/locomotivemtl/locomotive-boilerplate.git synced 2026-01-15 00:55:08 +08:00

Fix $container-width conflict

This commit is contained in:
Deven Caron
2022-06-06 14:42:25 -04:00
parent 520b75185f
commit 7ca7486913

View File

@@ -79,15 +79,8 @@ $unit: 60px;
$unit-small: 20px;
// Container
<<<<<<< HEAD
// =============================================================================
$container-width: 2000px;
$padding: $unit;
=======
// ==========================================================================
$padding: $unit;
>>>>>>> 26f5b77 (Remove unused `$container-width` SCSS variable)
// Grid
// ==========================================================================