diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-06 12:35:40 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-06 12:35:40 +0300 |
| commit | 28c363aa0beb5f9d38116dbc79e601b84e9e48e3 (patch) | |
| tree | 985eb8b8c85efdaacec057a7c403db25a3608c57 /source/blender/blenkernel/BKE_modifier.h | |
| parent | 79e8805a9e880cba15d5f19dd4345b7c462c884c (diff) | |
Fix bad conflict resolution
Diffstat (limited to 'source/blender/blenkernel/BKE_modifier.h')
0 files changed, 0 insertions, 0 deletions