fix: merge conflict issues

dwp · Jan 20, 2025 · 37cf494 · 37cf494
1 parent a90d23b
commit 37cf494
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 326 deletions.
diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss
@@ -4,7 +4,6 @@
 //
 
 // Add extra styles here
-@import "node_modules/@ministryofjustice/frontend/moj/all";
 @import "big-number";
 
 .white-link {

diff --git a/...iews/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html b/...iews/preferences/customer-view/alternative-formats/when-we-write-to-you/colour-paper.html
diff --git a/...nces/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html b/...nces/customer-view/alternative-formats/when-we-write-to-you/font-colour-spacing-size.html
diff --git a/...ews/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html b/...ews/preferences/customer-view/alternative-formats/when-we-write-to-you/large-print-1.html