Fix merge conflicts

ONSdigital · Oct 2, 2023 · 4881137 · 4881137
2 parents c345dd0 + 40090ac
commit 4881137
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml
@@ -12,11 +12,9 @@ description: A Helm chart for Kubernetes
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
 
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-version: 12.0.8
+version: 12.0.14
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 12.0.8
+appVersion: 12.0.14
 
diff --git a/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java b/src/main/java/uk/gov/ons/ctp/response/casesvc/representation/action/NotifyModel.java
@@ -98,7 +98,7 @@ public static class ClassifiersBuilder {
         private static final String REMINDER = "REMINDER";
         private static final String NOTIFICATION = "NOTIFICATION";
         // a region of YY appears to be any region that isnt england
-        private static final String NOT_ENGLAND = "YY";
+        private static final String NI_REGION_CODE = "YY";
 
         private String actionType;
         private String legalBasis;
@@ -115,8 +115,8 @@ public Classifiers build() {
             return new Classifiers(actionType, "", "", "", "");
           }
 
-          // if not not england is england. welcome to ras-rm.
-          if (!NOT_ENGLAND.equals(region)) {
+          // if NOT NI then England/Wales
+          if (!NI_REGION_CODE.equals(region)) {
             region = "";
           }