Resolved a conflict in generic_wfs_25d
Resolved a conflict in generic_wfs_25d

--HG--
extra : convert_revision : svn%3Ae730da3b-c3e2-4fc5-b1ca-054ac94edddb/trunk%40522

sfstoolbox/sfs,sfstoolbox/sfs-matlab