Commit beb35048 authored by Dave Cooper's avatar Dave Cooper

resolved conflict

parents b8562a9f e0685e98
......@@ -243,6 +243,8 @@ This must be specified by user code, or an error will result."
("Boolean. Regardless of :domain, if this is non-nil, nil values will be accepted. Defaults to t if (the default) is nil,
otherwise defaults to nil."
allow-nil? (null (the default)))
(email? nil)
("Boolean. If non-nil, then values which fail the type or validation test will still be allowed to be the value. Default is t."
allow-invalid? t)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment