Merge pull request #14892 from dagwieers/patch-14

Another misspelling
This commit is contained in:
Brian Coca 2016-03-09 23:57:56 -05:00
commit df1268ed69

View file

@ -56,7 +56,7 @@ class Conditional:
False if any of them evaluate as such.
'''
# since this is a mixin, it may not have an underlying datastructure
# since this is a mix-in, it may not have an underlying datastructure
# associated with it, so we pull it out now in case we need it for
# error reporting below
ds = None
@ -86,7 +86,7 @@ class Conditional:
if conditional in all_vars and '-' not in text_type(all_vars[conditional]):
conditional = all_vars[conditional]
# make sure the templar is using the variables specifed to this method
# make sure the templar is using the variables specified with this method
templar.set_available_variables(variables=all_vars)
try: