Lacey Sanderson8bebb35274Resolved merge conflict where we both fixed the same bug (in stock & feature check ->op is set before ensuring it's save on validation of node form)
8bebb35274
Resolved merge conflict where we both fixed the same bug (in stock & feature check ->op is set before ensuring it's save on validation of node form)