path fix, new variables added for colour added asl sufix on ghovuk co…

…lours.
UKHomeOffice · Oct 24, 2024 · 26a0ffd · 26a0ffd
2 parents cf1b8d0 + 2944d2a
commit 26a0ffd
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/assets/styles/_govuk-frontend.scss b/assets/styles/_govuk-frontend.scss
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @import 'govuk-frontend/dist/govuk/settings/index';
 @import 'govuk-frontend/dist/govuk/tools/index';
 @import 'govuk-frontend/dist/govuk/helpers/index';
@@ -6,3 +7,13 @@
 @import 'govuk-frontend/dist/govuk/objects/index';
 
 @import 'govuk-frontend/dist/govuk/overrides/index';
+=======
+@import 'govuk-frontend/dist/govuk/settings/all';
+@import 'govuk-frontend/dist/govuk/tools/all';
+@import 'govuk-frontend/dist/govuk/helpers/all';
+
+@import 'govuk-frontend/dist/govuk/core/all';
+@import 'govuk-frontend/dist/govuk/objects/all';
+
+@import 'govuk-frontend/dist/govuk/overrides/all';
+>>>>>>> 2944d2a9c9bdc00cc454c06c6c67d3790aa3bf7e