Change criteria for S011

A part of: https://trello.com/c/OBc5NGTY/304-s011-uk-change-criteria-to-nationality-uk-and-visiting-eu
alphagov · Oct 7, 2019 · 11eb0a7 · 11eb0a7
1 parent 730e0e5
commit 11eb0a7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/lib/brexit_checker/actions.yaml b/lib/brexit_checker/actions.yaml
@@ -167,12 +167,7 @@ actions:
   guidance_url: https://www.gov.uk/guidance/foreign-travel-insurance
   criteria:
   - all_of:
-    - any_of:
-      - nationality-uk
-      - nationality-row
-    - any_of:
-      - living-uk
-      - living-row
+    - nationality-uk
     - visiting-eu
   audience: citizen
 - id: S013

diff --git a/lib/brexit_checker/notifications.yaml b/lib/brexit_checker/notifications.yaml
@@ -42,7 +42,21 @@ notifications:
      action_id: T064
      note: "Link changed to provide hauliers with updated guidance."
      date: 2019-10-02
+<<<<<<< HEAD:lib/brexit_checker/notifications.yaml
    - uuid: "c23214f5-eee3-4528-88b1-c7d88fe59b7e"
      type: addition
      action_id: T091
      date: 2019-10-07
+=======
+   - uuid: "f37f8452-c81d-4cd6-82ce-6930a8a50b6d"
+     type: addition
+     action_id: S011
+     date: 2019-10-07
+     criteria:
+     - all_of:
+       - nationality-uk
+       - any_of:
+         - living-ie
+         - living-eu
+       - visiting-eu
+>>>>>>> Change criteria for S011:lib/brexit_checker/change_notes.yaml