Resove conflicts in spec/models/concerns/has_variable_spec.rb

spec/models/concerns/has_variable_spec.rb

@@ -45,11 +45,7 @@ describe HasVariable do
     end
 
     it 'fails to decrypt if iv is incorrect' do
-<<<<<<< HEAD
-      # attr_encrypted expects the IV to be 16-bytes and base64-encoded
-=======
       # attr_encrypted expects the IV to be 16 bytes and base64-encoded
->>>>>>> upstream/master
       subject.encrypted_value_iv = [SecureRandom.hex(8)].pack('m')
       subject.instance_variable_set(:@value, nil)