baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix merge conflicts

pull/1101/head
Arthur Campbell 3 years ago
parent
0705944de0
commit
d9f2bcd8c0
1 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      spec/models/form/sales/subsections/household_characteristics_spec.rb

9
spec/models/form/sales/subsections/household_characteristics_spec.rb
Unescape View File

@ -46,7 +46,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_gender_identity buyer_2_gender_identity
gender_2_buyer_retirement_value_check gender_2_buyer_retirement_value_check
buyer_2_working_situation buyer_2_working_situation
working_situation_2_buyer_retirement_value_check working_situation_2_retirement_value_check_joint_purchase
working_situation_buyer_2_income_value_check
buyer_2_live_in_property buyer_2_live_in_property
number_of_others_in_property number_of_others_in_property
person_2_known person_2_known
@ -56,8 +57,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
person_2_gender_identity person_2_gender_identity
gender_2_retirement_value_check gender_2_retirement_value_check
person_2_working_situation person_2_working_situation
working_situation_2_retirement_value_check_joint_purchase working_situation_2_retirement_value_check
working_situation_buyer_2_income_value_check
person_3_known person_3_known
person_3_relationship_to_buyer_1 person_3_relationship_to_buyer_1
person_3_age person_3_age
@ -127,7 +127,8 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
buyer_2_ethnic_background_mixed buyer_2_ethnic_background_mixed
buyer_2_ethnic_background_white buyer_2_ethnic_background_white
buyer_2_working_situation buyer_2_working_situation
working_situation_2_buyer_retirement_value_check working_situation_2_retirement_value_check_joint_purchase
working_situation_buyer_2_income_value_check
buyer_2_live_in_property buyer_2_live_in_property
number_of_others_in_property number_of_others_in_property
person_2_known person_2_known

Write Preview
Loading…
Cancel
Save