Merge branch 'main' into FS-4347-pages-displaying-incorrect-button-te…

…xt-v1
communitiesuk · May 17, 2024 · f236ee2 · f236ee2
2 parents f6adfbb + 0b4af8c
commit f236ee2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/fsd_config/form_jsons/cof/en/organisation-information-cof.json b/fsd_config/form_jsons/cof/en/organisation-information-cof.json
@@ -686,7 +686,7 @@
         },
         {
           "text": "Trust port",
-          "value": "trust-port"
+          "value": "Trust port"
         },
         {
           "text": "Other",
@@ -1031,8 +1031,8 @@
             "operator": "is",
             "value": {
               "type": "Value",
-              "value": "trust-port",
-              "display": "trust-port"
+              "value": "Trust port",
+              "display": "Trust port"
             }
           }
         ]

diff --git a/fsd_config/form_jsons/cof/eoi/en/organisation-details.json b/fsd_config/form_jsons/cof/eoi/en/organisation-details.json
@@ -220,7 +220,7 @@
         },
         {
           "text": "Trust port",
-          "value": "trust-port"
+          "value": "Trust port"
         },
         {
           "text": "Not yet incorporated",

diff --git a/version b/version
@@ -1 +1,5 @@
+<<<<<<< FS-4347-pages-displaying-incorrect-button-text-v1
 VERSION=0.1.276
+=======
+VERSION=0.1.275
+>>>>>>> main