fix rebase weirdness take 2

codeforamerica · Jan 8, 2025 · 5f69c7c · 5f69c7c
1 parent d8863e1
commit 5f69c7c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/spec/lib/pdf_filler/md_el101_pdf_spec.rb b/spec/lib/pdf_filler/md_el101_pdf_spec.rb
@@ -35,7 +35,11 @@
         expect(pdf_fields["ERO firm name"]).to eq "FileYourStateTaxes"
         expect(pdf_fields["to enter or generate my PIN"]).to eq "23456"
         expect(pdf_fields["Primary signature"]).to eq "Mary Lando"
+<<<<<<< HEAD
         expect(pdf_fields["Date"]).to eq expected_signature_date_pdf_value
+=======
+        expect(pdf_fields["Date"]).to eq expected_signature_date
+>>>>>>> 5391dad93 (fix rebase weirdness take 2)
         expect(pdf_fields["Spouses First Name"]).to eq("")
         expect(pdf_fields["Spouse MI"]).to eq("")
         expect(pdf_fields["Spouses Last Name"]).to eq("")
@@ -87,7 +91,11 @@
         expect(pdf_fields["ERO firm name_2"]).to eq "FileYourStateTaxes"
         expect(pdf_fields["to enter or generate my PIN_2"]).to eq "11111"
         expect(pdf_fields["Spouses signature"]).to eq "Marty Lando"
+<<<<<<< HEAD
         expect(pdf_fields["Date_2"]).to eq expected_signature_date_pdf_value
+=======
+        expect(pdf_fields["Date_2"]).to eq expected_signature_date
+>>>>>>> 5391dad93 (fix rebase weirdness take 2)
       end
     end
   end